This is an automated email from the ASF dual-hosted git repository. mariofusco pushed a commit to branch q3lts in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
commit 8b4f4c29d5b6173bdb4a05681c5d9e5caef576fe Author: Pere Fernández <[email protected]> AuthorDate: Tue Dec 5 20:47:10 2023 +0100 - Fixing JobResource Tests (#1930) --- .../executor/DefaultJobExecutorResolver.java | 4 ++-- .../jobs/service/json/JacksonConfiguration.java | 6 ++--- .../service/management/HttpGatekeeperFilter.java | 6 ++--- .../management/JobServiceInstanceManager.java | 12 +++++----- .../management/JobServiceLeaderHealthCheck.java | 8 +++---- .../DefaultJobServiceManagementRepository.java | 4 ++-- .../repository/impl/InMemoryConfiguration.java | 6 ++--- .../repository/impl/InMemoryJobRepository.java | 6 ++--- .../marshaller/JobDetailsMarshaller.java | 6 ++--- .../repository/marshaller/RecipientMarshaller.java | 4 ++-- .../repository/marshaller/TriggerMarshaller.java | 4 ++-- .../service/resource/CallbackResourceTest.java | 8 +++---- .../kogito/jobs/service/resource/JobResource.java | 26 +++++++++++----------- .../resource/JobServiceManagementResource.java | 12 +++++----- .../resource/error/BaseExceptionMapper.java | 6 ++--- .../error/InvalidScheduleTimeExceptionMapper.java | 4 ++-- .../error/JobValidationExceptionMapper.java | 4 ++-- .../jobs/service/resource/v2/JobResourceV2.java | 24 ++++++++++---------- .../service/scheduler/JobSchedulerManager.java | 8 +++---- .../scheduler/impl/TimerDelegateJobScheduler.java | 6 ++--- .../scheduler/impl/VertxTimerServiceScheduler.java | 4 ++-- .../kie/kogito/jobs/service/stream/JobStreams.java | 6 ++--- .../service/validation/JobDetailsValidator.java | 6 ++--- .../jobs/service/validation/JobValidator.java | 6 ++--- .../validation/RecipientInstanceValidator.java | 6 ++--- .../management/JobServiceInstanceManagerTest.java | 6 ++--- .../service/messaging/BaseMessagingApiTest.java | 4 ++-- .../jobs/service/resource/BaseJobResourceTest.java | 8 +++++++ .../resource/BaseKeycloakJobServiceTest.java | 12 ++++++++-- .../resource/CommonBaseJobResourceTest.java | 4 ++-- .../BaseHttpRecipientPayloadTypesTest.java | 6 ++--- .../BaseSinkRecipientPayloadTypesTest.java | 4 ++-- .../validation/RecipientValidatorProviderTest.java | 4 ++-- 33 files changed, 128 insertions(+), 112 deletions(-) diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java index 0eddc443f..2bbeffcf3 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.jobs.service.executor; +import org.kie.kogito.jobs.service.model.JobDetails; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; -import org.kie.kogito.jobs.service.model.JobDetails; - @ApplicationScoped public class DefaultJobExecutorResolver implements JobExecutorResolver { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java index b42b5376f..a3d5bc41e 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java @@ -18,9 +18,6 @@ */ package org.kie.kogito.jobs.service.json; -import jakarta.enterprise.inject.Produces; -import jakarta.inject.Singleton; - import org.kie.kogito.jobs.service.api.serlialization.SerializationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +29,9 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.cloudevents.jackson.JsonFormat; import io.quarkus.jackson.ObjectMapperCustomizer; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; + public class JacksonConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(JacksonConfiguration.class); diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java index 09203d2ad..cdbe00a7b 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java @@ -20,14 +20,14 @@ package org.kie.kogito.jobs.service.management; import java.util.concurrent.atomic.AtomicBoolean; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.event.Observes; - import org.eclipse.microprofile.config.inject.ConfigProperty; import io.quarkus.vertx.web.RouteFilter; import io.vertx.ext.web.RoutingContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; + @ApplicationScoped public class HttpGatekeeperFilter { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java index a756746f6..5261170c5 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java @@ -25,12 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.event.Event; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Instance; -import jakarta.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.jobs.service.messaging.MessagingHandler; import org.kie.kogito.jobs.service.model.JobServiceManagementInfo; @@ -45,6 +39,12 @@ import io.smallrye.mutiny.Uni; import io.vertx.mutiny.core.TimeoutStream; import io.vertx.mutiny.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + @ApplicationScoped public class JobServiceInstanceManager { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java index c07792b0e..13af8fdcd 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java @@ -20,14 +20,14 @@ package org.kie.kogito.jobs.service.management; import java.util.concurrent.atomic.AtomicBoolean; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.event.Observes; - import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.HealthCheckResponseBuilder; import org.eclipse.microprofile.health.Readiness; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; + @Readiness @ApplicationScoped public class JobServiceLeaderHealthCheck implements HealthCheck { @@ -46,4 +46,4 @@ public class JobServiceLeaderHealthCheck implements HealthCheck { } return responseBuilder.down().build(); } -} \ No newline at end of file +} diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java index d7c36bbd4..7a7124127 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java @@ -21,8 +21,6 @@ package org.kie.kogito.jobs.service.repository.impl; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import jakarta.enterprise.context.ApplicationScoped; - import org.kie.kogito.jobs.service.model.JobServiceManagementInfo; import org.kie.kogito.jobs.service.repository.JobServiceManagementRepository; import org.kie.kogito.jobs.service.utils.DateUtil; @@ -30,6 +28,8 @@ import org.kie.kogito.jobs.service.utils.DateUtil; import io.quarkus.arc.DefaultBean; import io.smallrye.mutiny.Uni; +import jakarta.enterprise.context.ApplicationScoped; + @DefaultBean @ApplicationScoped public class DefaultJobServiceManagementRepository implements JobServiceManagementRepository { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java index bf349c863..202ecdf8d 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java @@ -18,15 +18,15 @@ */ package org.kie.kogito.jobs.service.repository.impl; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Produces; - import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; import io.quarkus.arc.DefaultBean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; + @ApplicationScoped public class InMemoryConfiguration { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java index ddbbe7e80..c559eefa0 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java @@ -28,9 +28,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; import org.kie.kogito.jobs.service.model.JobDetails; @@ -42,6 +39,9 @@ import org.kie.kogito.jobs.service.utils.DateUtil; import io.quarkus.arc.DefaultBean; import io.vertx.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @DefaultBean @ApplicationScoped public class InMemoryJobRepository extends BaseReactiveJobRepository implements ReactiveJobRepository { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java index 65e80f4b3..6772a5091 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java @@ -24,15 +24,15 @@ import java.util.Date; import java.util.Map; import java.util.Optional; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - import org.kie.kogito.jobs.service.model.JobDetails; import org.kie.kogito.jobs.service.model.JobStatus; import io.quarkus.arc.DefaultBean; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import static org.kie.kogito.jobs.service.utils.DateUtil.DEFAULT_ZONE; @DefaultBean diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java index c45bd7b10..6d28b6c94 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java @@ -21,13 +21,13 @@ package org.kie.kogito.jobs.service.repository.marshaller; import java.util.Objects; import java.util.Optional; -import jakarta.enterprise.context.ApplicationScoped; - import org.kie.kogito.jobs.service.model.Recipient; import org.kie.kogito.jobs.service.model.RecipientInstance; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class RecipientMarshaller implements Marshaller<Recipient, JsonObject> { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java index fecfa1f92..3c0fab4b2 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java @@ -22,8 +22,6 @@ import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.Optional; -import jakarta.enterprise.context.ApplicationScoped; - import org.kie.kogito.timer.Trigger; import org.kie.kogito.timer.impl.IntervalTrigger; import org.kie.kogito.timer.impl.PointInTimeTrigger; @@ -31,6 +29,8 @@ import org.kie.kogito.timer.impl.SimpleTimerTrigger; import io.vertx.core.json.JsonObject; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class TriggerMarshaller implements Marshaller<Trigger, JsonObject> { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java index 644a0d8e0..bb8f89403 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java @@ -21,6 +21,10 @@ package org.kie.kogito.jobs.service.resource; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -29,10 +33,6 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - @Path("/callback") public class CallbackResourceTest { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java index 2bf124b82..1fb16174d 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java @@ -18,19 +18,6 @@ */ package org.kie.kogito.jobs.service.resource; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.PATCH; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody; import org.kie.kogito.jobs.api.Job; @@ -46,6 +33,19 @@ import org.slf4j.LoggerFactory; import io.smallrye.mutiny.Uni; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher; @ApplicationScoped diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java index 4a4cfe3af..8ed190d97 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java @@ -18,18 +18,18 @@ */ package org.kie.kogito.jobs.service.resource; -import jakarta.enterprise.event.Event; -import jakarta.inject.Inject; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.Response; - import org.kie.kogito.jobs.service.management.ReleaseLeaderEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.smallrye.mutiny.Uni; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; + @Path("/management") public class JobServiceManagementResource { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java index 73476dfa3..bfb0e8e6e 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java @@ -18,13 +18,13 @@ */ package org.kie.kogito.jobs.service.resource.error; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ExceptionMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public abstract class BaseExceptionMapper<T extends Throwable> implements ExceptionMapper<T> { public static final int DEFAULT_ERROR_CODE = 500; diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java index 1de5f6335..5cf974e27 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.jobs.service.resource.error; -import jakarta.ws.rs.ext.Provider; - import org.kie.kogito.jobs.service.exception.InvalidScheduleTimeException; +import jakarta.ws.rs.ext.Provider; + @Provider public class InvalidScheduleTimeExceptionMapper extends BaseExceptionMapper<InvalidScheduleTimeException> { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java index b2e050e27..1bbfb7170 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java @@ -18,10 +18,10 @@ */ package org.kie.kogito.jobs.service.resource.error; -import jakarta.ws.rs.ext.Provider; - import org.kie.kogito.jobs.service.exception.JobValidationException; +import jakarta.ws.rs.ext.Provider; + @Provider public class JobValidationExceptionMapper extends BaseExceptionMapper<JobValidationException> { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java index a55727bed..f9771f1ae 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java @@ -18,18 +18,6 @@ */ package org.kie.kogito.jobs.service.resource.v2; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - import org.eclipse.microprofile.openapi.annotations.Operation; import org.kie.kogito.jobs.service.adapter.JobDetailsAdapter; import org.kie.kogito.jobs.service.api.Job; @@ -43,6 +31,18 @@ import org.slf4j.LoggerFactory; import io.smallrye.mutiny.Uni; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher; @ApplicationScoped diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java index fa80ae3cc..c924efaee 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java @@ -23,10 +23,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.event.Observes; -import jakarta.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; import org.kie.kogito.jobs.service.management.MessagingChangeEvent; @@ -41,6 +37,10 @@ import org.slf4j.LoggerFactory; import io.vertx.mutiny.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; + @ApplicationScoped public class JobSchedulerManager { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java index 06e396e2c..6f5f028b3 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java @@ -22,9 +22,6 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletionStage; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -46,6 +43,9 @@ import org.reactivestreams.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * Job Scheduler based on Vert.x engine. */ diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java index 9c81c786f..431727ac1 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java @@ -24,8 +24,6 @@ import java.time.chrono.ChronoZonedDateTime; import java.util.Collection; import java.util.Optional; -import jakarta.enterprise.context.ApplicationScoped; - import org.kie.kogito.jobs.service.model.ManageableJobHandle; import org.kie.kogito.jobs.service.utils.DateUtil; import org.kie.kogito.timer.InternalSchedulerService; @@ -39,6 +37,8 @@ import org.kie.kogito.timer.impl.TimerJobInstance; import io.vertx.mutiny.core.Vertx; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class VertxTimerServiceScheduler implements TimerService<ManageableJobHandle>, InternalSchedulerService { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java index 35d392aab..a951695b1 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java @@ -18,9 +18,6 @@ */ package org.kie.kogito.jobs.service.stream; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; @@ -34,6 +31,9 @@ import org.slf4j.LoggerFactory; import io.smallrye.reactive.messaging.annotations.Broadcast; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * Class that configure the Consumers for Job Streams,like Job Executed, Job Error... and execute the actions for each * received item. diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java index d4165a1f5..548717c4f 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java @@ -20,13 +20,13 @@ package org.kie.kogito.jobs.service.validation; import java.util.Objects; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - import org.apache.commons.lang3.StringUtils; import org.kie.kogito.jobs.service.exception.JobValidationException; import org.kie.kogito.jobs.service.model.JobDetails; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class JobDetailsValidator { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java index 33a955645..99ab02ecc 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java @@ -18,14 +18,14 @@ */ package org.kie.kogito.jobs.service.validation; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - import org.apache.commons.lang3.StringUtils; import org.kie.kogito.jobs.service.api.Job; import org.kie.kogito.jobs.service.api.schedule.timer.TimerSchedule; import org.kie.kogito.jobs.service.exception.JobValidationException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class JobValidator { diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java index 0196fea03..07d2166fc 100644 --- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java +++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java @@ -18,12 +18,12 @@ */ package org.kie.kogito.jobs.service.validation; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - import org.kie.kogito.jobs.service.exception.JobValidationException; import org.kie.kogito.jobs.service.model.Recipient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class RecipientInstanceValidator { diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java index 58a89f89e..5fada4526 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java @@ -23,9 +23,6 @@ import java.util.Arrays; import java.util.function.Function; import java.util.stream.Stream; -import jakarta.enterprise.event.Event; -import jakarta.enterprise.inject.Instance; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -45,6 +42,9 @@ import io.quarkus.runtime.StartupEvent; import io.vertx.mutiny.core.TimeoutStream; import io.vertx.mutiny.core.Vertx; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.inject.Instance; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java index aadf605f1..f2f2e5534 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java @@ -26,8 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; import java.util.function.Supplier; -import jakarta.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; @@ -43,6 +41,8 @@ import org.kie.kogito.jobs.api.event.serialization.JobCloudEventSerializer; import io.restassured.http.ContentType; import io.restassured.response.Response; +import jakarta.inject.Inject; + import static io.restassured.RestAssured.given; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java index 835e7f25e..60a7e2d9f 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java @@ -60,6 +60,10 @@ public abstract class BaseJobResourceTest extends CommonBaseJobResourceTest { .statusCode(OK) .extract() .as(ScheduledJob.class); + + // Resetting the date to set the right UTC ZoneId. This is required due to recent changes on jackson-datatype-jsr310 + response.setExpirationTime(DateUtil.instantToZonedDateTime(response.getExpirationTime().toInstant())); + assertEquals(job, response); } @@ -116,6 +120,10 @@ public abstract class BaseJobResourceTest extends CommonBaseJobResourceTest { .contentType(ContentType.JSON) .extract() .as(ScheduledJob.class); + + // Resetting the date to set the right UTC ZoneId. This is required due to recent changes on jackson-datatype-jsr310 + response.setExpirationTime(DateUtil.instantToZonedDateTime(response.getExpirationTime().toInstant())); + assertEquals(job, response); } diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java index c0c26dd16..617efe207 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java @@ -20,8 +20,6 @@ package org.kie.kogito.jobs.service.resource; import java.io.IOException; -import jakarta.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -42,6 +40,8 @@ import io.restassured.http.ContentType; import io.restassured.response.ValidatableResponse; import io.restassured.specification.RequestSpecification; +import jakarta.inject.Inject; + import static io.restassured.RestAssured.given; import static java.util.concurrent.TimeUnit.MINUTES; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -87,6 +87,10 @@ public abstract class BaseKeycloakJobServiceTest { final ScheduledJob response = createJob(jobToJson(job), getAccessToken("jdoe"), OK_CODE) .extract() .as(ScheduledJob.class); + + // Resetting the date to set the right UTC ZoneId. This is required due to recent changes on jackson-datatype-jsr310 + response.setExpirationTime(DateUtil.instantToZonedDateTime(response.getExpirationTime().toInstant())); + assertEquals(job, response); } @@ -153,6 +157,10 @@ public abstract class BaseKeycloakJobServiceTest { .contentType(ContentType.JSON) .extract() .as(ScheduledJob.class); + + // Resetting the date to set the right UTC ZoneId. This is required due to recent changes on jackson-datatype-jsr310 + response.setExpirationTime(DateUtil.instantToZonedDateTime(response.getExpirationTime().toInstant())); + assertEquals(job, response); } diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java index 9daf41617..d0e191149 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java @@ -20,8 +20,6 @@ package org.kie.kogito.jobs.service.resource; import java.io.IOException; -import jakarta.inject.Inject; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -33,6 +31,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.restassured.http.ContentType; import io.restassured.response.ValidatableResponse; +import jakarta.inject.Inject; + import static io.restassured.RestAssured.given; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java index 3103f13fd..ae4403167 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java @@ -20,8 +20,6 @@ package org.kie.kogito.jobs.service.resource.v2.http.recipient; import java.time.OffsetDateTime; -import jakarta.inject.Inject; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kie.kogito.jobs.service.api.Job; @@ -37,11 +35,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.tomakehurst.wiremock.WireMockServer; -import static java.util.concurrent.TimeUnit.MINUTES; +import jakarta.inject.Inject; + import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static java.util.concurrent.TimeUnit.MINUTES; import static org.assertj.core.api.Assertions.assertThat; import static org.kie.kogito.jobs.service.TestUtils.assertJobHasFinishedV2; import static org.kie.kogito.jobs.service.TestUtils.createJobV2; diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java index e58a5b5c8..e1d4efed8 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java @@ -21,8 +21,6 @@ package org.kie.kogito.jobs.service.resource.v2.sink.recipient; import java.net.URI; import java.time.OffsetDateTime; -import jakarta.inject.Inject; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kie.kogito.jobs.service.api.Job; @@ -38,6 +36,8 @@ import com.github.tomakehurst.wiremock.WireMockServer; import io.cloudevents.SpecVersion; +import jakarta.inject.Inject; + import static java.util.concurrent.TimeUnit.MINUTES; import static org.assertj.core.api.Assertions.assertThat; import static org.kie.kogito.jobs.service.TestUtils.assertJobHasFinishedV2; diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java index a1424980e..cf72bf319 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java @@ -21,13 +21,13 @@ package org.kie.kogito.jobs.service.validation; import java.util.Arrays; import java.util.stream.Stream; -import jakarta.enterprise.inject.Instance; - import org.junit.jupiter.api.Test; import org.kie.kogito.jobs.service.api.PayloadData; import org.kie.kogito.jobs.service.api.Recipient; import org.mockito.Mockito; +import jakarta.enterprise.inject.Instance; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
