You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ma...@apache.org on 2023/12/14 15:50:54 UTC
(incubator-kie-kogito-apps) 04/12: rebase main
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 1422dfb0b1d7ab4ed1278503d8dc19aef8fd7a3f
Author: mariofusco <ma...@gmail.com>
AuthorDate: Thu Dec 14 11:29:54 2023 +0100
rebase main
---
.../kogito/index/AbstractProcessDataIndexIT.java | 6 +-
.../kogito/index/ProcessDataIndexInfinispanIT.java | 2 +-
.../kogito/index/ProcessDataIndexMongoDBIT.java | 2 +-
.../kie/kogito/index/ProcessDataIndexOracleIT.java | 2 +-
.../kogito/index/ProcessDataIndexPostgreSqlIT.java | 2 +-
.../src/main/java/org/kie/kogito/HelloService.java | 2 +-
.../src/main/java/org/kie/kogito/HelloService.java | 2 +-
.../src/main/java/org/kie/kogito/HelloService.java | 2 +-
.../src/main/java/org/kie/kogito/HelloService.java | 2 +-
...NativeQuarkusTrustyExplainabilityEnd2EndIT.java | 4 +-
data-index/data-index-common/pom.xml | 4 +
.../index/api/KogitoRuntimeCommonClient.java | 4 +-
.../ProcessInstanceErrorDataEventMerger.java | 2 +-
.../mapper/ProcessInstanceNodeDataEventMerger.java | 2 +-
.../ProcessInstanceStateDataEventMerger.java | 2 +-
.../ProcessInstanceVariableDataEventMerger.java | 2 +-
.../UserTaskInstanceAssignmentDataEventMerger.java | 2 +-
.../UserTaskInstanceAttachmentDataEventMerger.java | 2 +-
.../UserTaskInstanceCommentDataEventMerger.java | 2 +-
.../UserTaskInstanceDeadlineDataEventMerger.java | 2 +-
.../mapper/UserTaskInstanceStateEventMerger.java | 2 +-
.../UserTaskInstanceVariableDataEventMerger.java | 2 +-
.../kogito/index/json/ObjectMapperProducer.java | 2 +-
.../kie/kogito/index/service/IndexingService.java | 6 +-
.../graphql/AbstractGraphQLSchemaManager.java | 4 +-
.../index/graphql/DefaultDateTimeCoercing.java | 2 +-
.../index/graphql/GraphQLInstrumentation.java | 4 +-
.../kie/kogito/index/graphql/GraphQLProducer.java | 6 +-
.../index/graphql/GraphQLScalarTypeProducer.java | 6 +-
.../index/graphql/OracleDateTimeCoercing.java | 2 +-
.../index/graphql/PostgreSqlDateTimeCoercing.java | 2 +-
.../index/vertx/BlockingGraphqlRouterProducer.java | 7 +-
.../index/vertx/ReactiveGraphqlRouterProducer.java | 7 +-
.../index/service/api/KogitoRuntimeClientImpl.java | 4 +-
.../index/service/auth/MultiTenantResolver.java | 4 +-
.../service/graphql/GraphQLProtoSchemaMapper.java | 6 +-
.../service/graphql/GraphQLSchemaManagerImpl.java | 13 +-
.../messaging/BlockingMessagingEventConsumer.java | 8 +-
.../service/messaging/DomainEventConsumer.java | 6 +-
.../messaging/KogitoIndexEventConverter.java | 4 +-
.../messaging/ReactiveMessagingEventConsumer.java | 6 +-
.../index/service/vertx/VertxRouterSetup.java | 6 +-
.../service/AbstractDomainIndexingServiceIT.java | 2 +-
.../kogito/index/service/AbstractIndexingIT.java | 7 +-
.../index/service/AbstractIndexingServiceIT.java | 4 +-
.../org/kie/kogito/index/service/GraphQLUtils.java | 101 +++++++++-----
.../index/service/cache/AbstractQueryIT.java | 2 +-
.../index/service/cache/AbstractStorageIT.java | 2 +-
.../graphql/AbstractWebSocketSubscriptionIT.java | 2 +-
.../query/AbstractGraphQLQueryOrderByIT.java | 2 +-
.../query/AbstractGraphQLRuntimesQueriesIT.java | 2 +-
.../AbstractDomainMessagingConsumerIT.java | 2 +-
.../AbstractDomainMessagingHttpConsumerIT.java | 7 +-
.../messaging/AbstractMessagingConsumerIT.java | 2 +-
.../messaging/AbstractMessagingHttpConsumerIT.java | 7 +-
.../messaging/AbstractMessagingLoadKafkaIT.java | 2 +-
.../messaging/KogitoIndexEventConverterTest.java | 2 +-
.../ReactiveMessagingEventConsumerTest.java | 2 +-
.../test/InMemoryMessagingTestResource.java | 3 +-
.../src/test/resources/graphql_queries.json | 151 +++++----------------
.../index/storage/DataIndexStorageServiceImpl.java | 4 +-
.../index/infinispan/InfinispanCacheStartup.java | 6 +-
.../protostream/ProtostreamProducer.java | 6 +-
.../infinispan/schema/ProtoSchemaAcceptor.java | 2 +-
.../infinispan/schema/ProtoSchemaManager.java | 6 +-
.../mongodb/storage/MongoModelServiceImpl.java | 8 +-
.../mongodb/storage/ProcessIndexObserver.java | 8 +-
.../mock/MockIndexCreateOrUpdateEventListener.java | 4 +-
.../kogito/index/mongodb/query/DomainQueryIT.java | 2 +-
.../kie/kogito/index/mongodb/query/JobQueryIT.java | 2 +-
.../mongodb/query/ProcessDefinitionQueryIT.java | 2 +-
.../index/mongodb/query/ProcessIdQueryIT.java | 2 +-
.../mongodb/query/ProcessInstanceQueryIT.java | 2 +-
.../mongodb/query/UserTaskInstanceQueryIT.java | 2 +-
.../index/mongodb/storage/DomainStorageIT.java | 2 +-
.../kogito/index/mongodb/storage/JobStorageIT.java | 2 +-
.../mongodb/storage/MongoModelServiceImplIT.java | 2 +-
.../storage/ProcessDefinitionStorageIT.java | 2 +-
.../index/mongodb/storage/ProcessIdStorageIT.java | 2 +-
.../mongodb/storage/ProcessIndexObserverIT.java | 2 +-
.../mongodb/storage/ProcessInstanceStorageIT.java | 2 +-
.../mongodb/storage/UserTaskInstanceStorageIT.java | 2 +-
.../index/oracle/model/AttachmentEntity.java | 12 +-
.../kogito/index/oracle/model/CommentEntity.java | 12 +-
.../kie/kogito/index/oracle/model/JobEntity.java | 6 +-
.../index/oracle/model/JobEntityRepository.java | 2 +-
.../kogito/index/oracle/model/MilestoneEntity.java | 16 +--
.../kie/kogito/index/oracle/model/NodeEntity.java | 26 ++--
.../index/oracle/model/NodeInstanceEntity.java | 14 +-
.../oracle/model/ProcessDefinitionEntity.java | 23 ++--
.../model/ProcessDefinitionEntityRepository.java | 2 +-
.../index/oracle/model/ProcessInstanceEntity.java | 28 ++--
.../model/ProcessInstanceEntityRepository.java | 2 +-
.../oracle/model/ProcessInstanceErrorEntity.java | 2 +-
.../index/oracle/model/UserTaskInstanceEntity.java | 31 ++---
.../model/UserTaskInstanceEntityRepository.java | 2 +-
.../index/oracle/storage/AbstractStorage.java | 6 +-
.../index/oracle/storage/JobEntityStorage.java | 4 +-
.../kogito/index/oracle/storage/OracleQuery.java | 29 ++--
.../index/oracle/storage/OracleStorageService.java | 10 +-
.../storage/ProcessDefinitionEntityStorage.java | 8 +-
.../storage/ProcessInstanceEntityStorage.java | 4 +-
.../storage/UserTaskInstanceEntityStorage.java | 4 +-
.../index/oracle/mapper/JobEntityMapperIT.java | 2 +-
.../mapper/ProcessDefinitionEntityMapperIT.java | 2 +-
.../mapper/ProcessInstanceEntityMapperIT.java | 2 +-
.../mapper/UserTaskInstanceEntityMapperIT.java | 2 +-
.../index/oracle/query/JobEntityQueryIT.java | 2 +-
.../query/ProcessDefinitionEntityQueryIT.java | 2 +-
.../oracle/query/ProcessInstanceEntityQueryIT.java | 2 +-
.../query/UserTaskInstanceEntityQueryIT.java | 2 +-
.../index/oracle/schema/DDLSchemaExporter.java | 2 +-
.../index/oracle/storage/DomainQueryTest.java | 16 +--
.../kogito/index/oracle/storage/JobStorageIT.java | 2 +-
.../oracle/storage/ProcessDefinitionStorageIT.java | 2 +-
.../oracle/storage/ProcessInstanceStorageIT.java | 2 +-
.../oracle/storage/UserTaskInstanceStorageIT.java | 2 +-
.../PostgresDataIndexDatabaseManagerImpl.java | 6 +-
.../ProcessInstanceVariableMappingIT.java | 16 +--
.../PostgresDataIndexDatabaseManagerImplTest.java | 2 +-
.../index/postgresql/model/AttachmentEntity.java | 12 +-
.../index/postgresql/model/CommentEntity.java | 12 +-
.../kogito/index/postgresql/model/JobEntity.java | 6 +-
.../postgresql/model/JobEntityRepository.java | 2 +-
.../index/postgresql/model/MilestoneEntity.java | 16 +--
.../kogito/index/postgresql/model/NodeEntity.java | 26 ++--
.../index/postgresql/model/NodeInstanceEntity.java | 14 +-
.../postgresql/model/ProcessDefinitionEntity.java | 23 ++--
.../model/ProcessDefinitionEntityRepository.java | 2 +-
.../postgresql/model/ProcessInstanceEntity.java | 26 ++--
.../model/ProcessInstanceEntityRepository.java | 2 +-
.../model/ProcessInstanceErrorEntity.java | 2 +-
.../postgresql/model/UserTaskInstanceEntity.java | 28 ++--
.../model/UserTaskInstanceEntityRepository.java | 2 +-
.../index/postgresql/storage/AbstractStorage.java | 6 +-
.../index/postgresql/storage/JobEntityStorage.java | 4 +-
.../index/postgresql/storage/PostgreSqlQuery.java | 30 ++--
.../storage/PostgreSqlStorageService.java | 10 +-
.../storage/ProcessDefinitionEntityStorage.java | 10 +-
.../storage/ProcessInstanceEntityStorage.java | 4 +-
.../storage/UserTaskInstanceEntityStorage.java | 4 +-
.../index/postgresql/mapper/JobEntityMapperIT.java | 2 +-
.../mapper/ProcessDefinitionEntityMapperIT.java | 2 +-
.../mapper/ProcessInstanceEntityMapperIT.java | 2 +-
.../mapper/UserTaskInstanceEntityMapperIT.java | 2 +-
.../index/postgresql/query/JobEntityQueryIT.java | 2 +-
.../query/ProcessDefinitionEntityQueryIT.java | 2 +-
.../query/ProcessInstanceEntityQueryIT.java | 2 +-
.../query/UserTaskInstanceEntityQueryIT.java | 2 +-
.../index/postgresql/schema/DDLSchemaExporter.java | 2 +-
.../index/postgresql/storage/DomainQueryTest.java | 16 +--
.../index/postgresql/storage/JobStorageIT.java | 2 +-
.../storage/ProcessDefinitionStorageIT.java | 2 +-
.../storage/ProcessInstanceStorageIT.java | 2 +-
.../storage/UserTaskInstanceStorageIT.java | 2 +-
.../kogito/index/protobuf/ProtostreamProducer.java | 4 +-
.../index/addon/DataIndexEventPublisher.java | 6 +-
.../index/addon/ProcessDefinitionRegister.java | 98 +++++++++++++
.../addon/api/KogitoAddonRuntimeClientImpl.java | 6 +-
.../api/KogitoAddonRuntimeClientImplTest.java | 2 +-
.../graphql/GraphQLAddonSchemaManagerImpl.java | 2 +-
.../index/addon/vertx/VertxGraphiQLSetup.java | 6 +-
.../api/BaseExplainabilityRequest.java | 6 +-
.../api/BaseExplainabilityResult.java | 2 +-
.../api/CounterfactualDomainCategorical.java | 2 +-
.../api/CounterfactualDomainRange.java | 2 +-
.../api/CounterfactualExplainabilityRequest.java | 4 +-
.../api/CounterfactualExplainabilityResult.java | 2 +-
.../api/LIMEExplainabilityRequest.java | 4 +-
.../api/LIMEExplainabilityResult.java | 2 +-
.../kogito/explainability/api/ModelIdentifier.java | 2 +-
.../messaging/ExplainabilityMessagingHandler.java | 7 +-
.../BaseExplainabilityMessagingHandlerIT.java | 2 +-
.../explainability/rest/ExplainabilityApiV1.java | 16 +--
.../explainability/rest/LocalExplainerMock.java | 2 +-
.../rest/PredictionProviderFactoryMock.java | 2 +-
.../explainability/ExplanationServiceImpl.java | 4 +-
.../PredictionProviderFactoryImpl.java | 4 +-
.../handlers/CounterfactualExplainerProducer.java | 6 +-
.../CounterfactualExplainerServiceHandler.java | 4 +-
.../handlers/LimeExplainerProducer.java | 6 +-
.../handlers/LimeExplainerServiceHandler.java | 4 +-
.../LocalExplainerServiceHandlerRegistry.java | 8 +-
.../explainability/ExplanationServiceImplTest.java | 2 +-
.../LocalExplainerServiceHandlerRegistryTest.java | 2 +-
.../jitexecutor/bpmn/JITBPMNServiceImpl.java | 2 +-
.../bpmn/api/BPMNValidationResource.java | 14 +-
.../dmn/JITDMNObjectMapperCustomizer.java | 2 +-
.../kogito/jitexecutor/dmn/JITDMNServiceImpl.java | 2 +-
.../jitexecutor/dmn/api/DMNValidationResource.java | 12 +-
.../kogito/jitexecutor/dmn/api/JITDMNResource.java | 14 +-
.../kogito/jitexecutor/dmn/api/SchemaResource.java | 12 +-
.../http/recipient/test/JobHttpRecipientTest.java | 2 +-
.../job-http-recipient/runtime/pom.xml | 2 +-
.../kogito/job/http/recipient/HttpJobExecutor.java | 6 +-
.../job/http/recipient/HttpRecipientValidator.java | 2 +-
.../recipient/common/http/HTTPRequestExecutor.java | 2 +-
.../job-sink-recipient/runtime/pom.xml | 2 +-
.../kogito/job/sink/recipient/SinkJobExecutor.java | 6 +-
.../job/sink/recipient/SinkRecipientValidator.java | 2 +-
jobs-service/jobs-service-common/pom.xml | 4 +
.../executor/DefaultJobExecutorResolver.java | 6 +-
.../jobs/service/json/JacksonConfiguration.java | 4 +-
.../service/management/HttpGatekeeperFilter.java | 4 +-
.../management/JobServiceInstanceManager.java | 10 +-
.../management/JobServiceLeaderHealthCheck.java | 4 +-
.../messaging/ReactiveMessagingEventConsumer.java | 4 +-
.../DefaultJobServiceManagementRepository.java | 2 +-
.../repository/impl/InMemoryConfiguration.java | 4 +-
.../repository/impl/InMemoryJobRepository.java | 4 +-
.../marshaller/JobDetailsMarshaller.java | 4 +-
.../repository/marshaller/RecipientMarshaller.java | 2 +-
.../repository/marshaller/TriggerMarshaller.java | 2 +-
.../service/resource/CallbackResourceTest.java | 14 +-
.../kogito/jobs/service/resource/JobResource.java | 30 ++--
.../resource/JobServiceManagementResource.java | 10 +-
.../resource/error/BaseExceptionMapper.java | 6 +-
.../resource/error/DefaultExceptionMapper.java | 2 +-
.../error/IllegalArgumentExceptionMapper.java | 2 +-
.../error/InvalidScheduleTimeExceptionMapper.java | 2 +-
.../error/JobValidationExceptionMapper.java | 2 +-
.../resource/error/NotFoundExceptionMapper.java | 4 +-
.../error/WebApplicationExceptionMapper.java | 4 +-
.../jobs/service/resource/v2/JobResourceV2.java | 26 ++--
.../service/scheduler/BaseTimerJobScheduler.java | 4 +-
.../service/scheduler/JobSchedulerManager.java | 6 +-
.../scheduler/impl/TimerDelegateJobScheduler.java | 4 +-
.../scheduler/impl/VertxTimerServiceScheduler.java | 2 +-
.../kie/kogito/jobs/service/stream/JobStreams.java | 4 +-
.../service/validation/JobDetailsValidator.java | 4 +-
.../jobs/service/validation/JobValidator.java | 4 +-
.../validation/RecipientInstanceValidator.java | 4 +-
.../validation/RecipientValidatorProvider.java | 6 +-
.../management/JobServiceInstanceManagerTest.java | 4 +-
.../service/messaging/BaseCallbackResource.java | 20 +--
.../service/messaging/BaseMessagingApiTest.java | 2 +-
.../resource/BaseKeycloakJobServiceTest.java | 2 +-
.../resource/CommonBaseJobResourceTest.java | 2 +-
.../service/resource/v2/ExternalResourcesMock.java | 8 +-
.../BaseHttpRecipientPayloadTypesTest.java | 10 +-
.../BaseSinkRecipientPayloadTypesTest.java | 2 +-
.../scheduler/BaseTimerJobSchedulerTest.java | 3 +-
.../impl/TimerDelegateJobSchedulerTest.java | 7 +-
.../validation/RecipientValidatorProviderTest.java | 2 +-
.../infinispan/InfinispanConfiguration.java | 15 +-
.../infinispan/InfinispanJobRepository.java | 6 +-
.../infinispan/marshaller/MarshallersProducer.java | 4 +-
.../messaging/InfinispanCallbackResource.java | 4 +-
.../infinispan/InfinispanConfigurationTest.java | 4 +-
.../infinispan/InfinispanJobRepositoryTest.java | 2 +-
.../messaging/InMemoryCallbackResource.java | 4 +-
.../InmemoryPostgreSqlJobRepositoryTest.java | 2 +-
.../messaging/http/CloudEventConverter.java | 2 +-
.../http/HttpReactiveMessagingEventConsumer.java | 4 +-
.../health/knative/KSinkInjectionHealthCheck.java | 2 +-
.../messaging/http/stream/HttpJobStreams.java | 6 +-
.../v2/HttpReactiveMessagingEventConsumer.java | 4 +-
.../messaging/http/CloudEventConverterTest.java | 2 +-
.../messaging/http/stream/HttpJobStreamsTest.java | 2 +-
.../messaging/kafka/KafkaMessagingHandler.java | 4 +-
.../kafka/KafkaReactiveMessagingEventConsumer.java | 4 +-
.../messaging/kafka/stream/KafkaConfiguration.java | 6 +-
.../messaging/kafka/stream/KafkaJobStreams.java | 4 +-
.../v2/KafkaReactiveMessagingEventConsumer.java | 4 +-
.../kafka/stream/KafkaConfigurationTest.java | 4 +-
jobs-service/jobs-service-mongodb/pom.xml | 4 +
.../repository/mongodb/MongoDBJobRepository.java | 15 +-
.../marshaller/MongoDBJobDetailsMarshaller.java | 4 +-
.../service/messaging/MongoDBCallbackResource.java | 4 +-
.../mongodb/MongoDBJobRepositoryExecutionTest.java | 4 +-
.../mongodb/MongoDBJobRepositoryTest.java | 2 +-
.../jobs-service-postgresql-common/pom.xml | 4 +
.../postgresql/PostgreSqlJobRepository.java | 17 +--
.../PostgreSqlJobServiceManagementRepository.java | 4 +-
.../postgresql/PostgreSqlJobRepositoryTest.java | 2 +-
...stgreSqlJobServiceManagementRepositoryTest.java | 2 +-
.../messaging/PostgreSqlCallbackResource.java | 4 +-
.../embedded/stream/EventPublisherJobStreams.java | 6 +-
.../stream/EventPublisherJobStreamsTest.java | 2 +-
kogito-apps-build-parent/pom.xml | 20 ++-
.../swf/tools/deployment/DevConsoleProcessor.java | 2 +-
.../pom.xml | 2 +-
.../custom/dashboard/CustomDashboardService.java | 18 +--
.../CustomDashboardFilterParamConverter.java | 4 +-
...ustomDashboardFilterParamConverterProvider.java | 6 +-
.../dashboard/impl/CustomDashboardStorageImpl.java | 2 +-
.../main/java/org/kie/kogito/mgmt/VertxRouter.java | 6 +-
.../kie/kogito/mgmt/NativeStaticContentTestIT.java | 4 +-
.../infinispan/InfinispanHealthCheckProducer.java | 6 +-
.../cache/InfinispanCacheShutdownObserver.java | 6 +-
.../infinispan/cache/InfinispanStorage.java | 6 +-
.../infinispan/cache/InfinispanStorageService.java | 8 +-
.../infinispan/cache/JsonDataFormatMarshaller.java | 4 +-
.../infinispan/cache/ProtobufCacheService.java | 4 +-
.../infinispan/cache/InfinispanStorageIT.java | 2 +-
.../mongodb/client/MongoClientManager.java | 4 +-
.../persistence/mongodb/index/IndexManager.java | 10 +-
.../mongodb/index/IndexSchemaAcceptor.java | 2 +-
.../mongodb/storage/MongoStorageManager.java | 4 +-
.../mongodb/client/MongoClientManagerIT.java | 2 +-
.../persistence/mongodb/index/IndexManagerIT.java | 2 +-
.../mongodb/mock/MockMongoModelService.java | 2 +-
.../mock/MockProcessIndexEventListener.java | 4 +-
.../persistence/mongodb/query/MongoQueryIT.java | 2 +-
.../mongodb/storage/MongoStorageIT.java | 2 +-
.../mongodb/storage/MongoStorageManagerIT.java | 2 +-
.../mongodb/storage/StorageListenerIT.java | 2 +-
.../mongodb/storage/StorageUtilsIT.java | 2 +-
.../persistence-commons-oracle/pom.xml | 4 +-
.../kie/kogito/persistence/oracle/OracleQuery.java | 8 +-
.../persistence/oracle/OracleStorageService.java | 4 +-
.../oracle/hibernate/JsonBinaryType.java | 58 ++++----
.../persistence/oracle/model/CacheEntity.java | 21 ++-
.../oracle/model/CacheEntityRepository.java | 2 +-
.../persistence/oracle/OracleStorageServiceIT.java | 4 +-
.../persistence/schema/DDLSchemaExporter.java | 2 +-
.../persistence-commons-postgresql/pom.xml | 4 +-
.../persistence/postgresql/PostgresQuery.java | 8 +-
.../postgresql/PostgresStorageService.java | 4 +-
.../postgresql/hibernate/JsonBinaryType.java | 48 +++----
.../persistence/postgresql/model/CacheEntity.java | 18 ++-
.../postgresql/model/CacheEntityRepository.java | 2 +-
.../postgresql/PostgresStorageServiceIT.java | 4 +-
.../persistence/schema/DDLSchemaExporter.java | 2 +-
.../protobuf/ProtobufMonitorService.java | 6 +-
.../persistence/protobuf/ProtobufService.java | 8 +-
.../protobuf/domain/ProtoDomainModelProducer.java | 8 +-
.../protobuf/ProtoDomainModelProducerTest.java | 2 +-
.../persistence/protobuf/ProtobufServiceTest.java | 2 +-
.../persistence/redis/RedisCacheManager.java | 4 +-
.../persistence/redis/RedisClientManager.java | 2 +-
.../persistence/redis/index/RedisIndexManager.java | 4 +-
.../reporting/api/BaseMappingsApiV1.java | 2 +-
.../database/BaseDatabaseManagerImpl.java | 2 +-
.../database/BaseDatabaseManagerImplTest.java | 4 +-
.../bootstrap/PostgresBootstrapLoaderImpl.java | 2 +-
.../bootstrap/PostgresStartupHandlerImpl.java | 6 +-
.../database/BasePostgresDatabaseManagerImpl.java | 18 +--
.../PostgresApplyMappingSqlBuilder.java | 2 +-
.../sqlbuilders/PostgresIndexesSqlBuilder.java | 2 +-
.../sqlbuilders/PostgresTableSqlBuilder.java | 2 +-
.../PostgresTriggerDeleteSqlBuilder.java | 2 +-
.../PostgresTriggerInsertSqlBuilder.java | 2 +-
.../service/PostgresMappingServiceImpl.java | 6 +-
.../sqlbuilders/BaseSqlBuilderImplTest.java | 2 +-
.../reporting/api/PostgresMappingsApiV1.java | 20 +--
.../GenericPostgresDatabaseManagerImpl.java | 6 +-
.../postgresql/reporting/BasicTypeMappingIT.java | 16 +--
.../ComplexHierarchicalTypeMappingIT.java | 16 +--
.../reporting/HierarchicalTypeMappingIT.java | 16 +--
.../reporting/api/PostgresMappingsApiV1Test.java | 2 +-
.../GenericPostgresDatabaseManagerImplTest.java | 2 +-
.../PostgresApplyMappingSqlBuilderIT.java | 16 +--
.../extension/deployment/DevConsoleProcessor.java | 2 +-
.../runtime-tools-quarkus-extension/pom.xml | 2 +-
.../extension/runtime/forms/FormsService.java | 22 +--
.../forms/converter/FormFilterParamConverter.java | 4 +-
.../FormFilterParamConverterProvider.java | 6 +-
.../runtime/forms/impl/FormsStorageImpl.java | 2 +-
.../java/org/kie/kogito/security/UserResource.java | 10 +-
.../org/kie/kogito/task/console/VertxRouter.java | 6 +-
.../task/console/NativeStaticContentTestIT.java | 4 +-
.../java/org/kie/kogito/trusty/ui/VertxRouter.java | 6 +-
.../trusty/ui/NativeStaticContentTestIT.java | 4 +-
.../common/requests/CounterfactualRequest.java | 2 +-
.../responses/CounterfactualRequestResponse.java | 2 +-
.../responses/CounterfactualResultsResponse.java | 4 +-
.../trusty-service/trusty-service-common/pom.xml | 4 +
.../trusty/service/common/TrustyServiceImpl.java | 4 +-
.../trusty/service/common/api/DecisionsApiV1.java | 12 +-
.../trusty/service/common/api/ExecutionsApiV1.java | 14 +-
.../service/common/api/ExplainabilityApiV1.java | 16 +--
...tualExplainabilityResultsManagerDuplicates.java | 4 +-
...lExplainabilityResultsManagerSlidingWindow.java | 2 +-
.../CounterfactualExplainerServiceHandler.java | 4 +-
.../handlers/ExplainerServiceHandlerRegistry.java | 8 +-
.../handlers/LIMEExplainerServiceHandler.java | 4 +-
.../common/handlers/LIMESaliencyConverter.java | 4 +-
.../incoming/ExplainabilityResultConsumer.java | 4 +-
.../messaging/incoming/ModelEventConsumer.java | 4 +-
.../messaging/incoming/TraceEventConsumer.java | 4 +-
.../outgoing/ExplainabilityRequestProducer.java | 5 +-
.../service/common/AbstractTrustyServiceIT.java | 2 +-
.../service/common/CacheManagerServiceMock.java | 2 +-
.../common/StorageExceptionsProviderMock.java | 2 +-
.../trusty/service/common/TrustyServiceTest.java | 2 +-
.../service/common/api/ExplainabilityApiV1IT.java | 2 +-
.../common/api/ExplainabilityApiV1Test.java | 2 +-
.../ExplainerServiceHandlerRegistryTest.java | 2 +-
.../incoming/AbstractModelEventConsumerIT.java | 2 +-
.../incoming/AbstractTraceEventConsumerIT.java | 2 +-
.../incoming/ExplainabilityResultConsumerTest.java | 2 +-
.../ExplainabilityRequestProducerTest.java | 3 +-
.../service/common/mocks/StorageImplMock.java | 2 +-
.../NativeInfinispanTrustyServiceIT.java | 4 +-
.../kogito/trusty/storage/api/model/Execution.java | 2 +-
.../storage/api/model/decision/Decision.java | 2 +-
.../trusty/storage/api/model/process/Process.java | 2 +-
.../storage/common/TrustyStorageServiceImpl.java | 4 +-
.../InfinispanStorageExceptionsProviderImpl.java | 2 +-
.../storage/infinispan/ProtostreamProducer.java | 6 +-
.../postgresql/BaseTransactionalStorage.java | 2 +-
.../postgresql/CounterfactualRequestsStorage.java | 4 +-
.../postgresql/CounterfactualResultsStorage.java | 4 +-
.../postgresql/DMNModelWithMetadataStorage.java | 4 +-
.../storage/postgresql/DecisionsStorage.java | 4 +-
.../storage/postgresql/LIMEResultsStorage.java | 4 +-
.../PostgreSQLStorageExceptionsProviderImpl.java | 2 +-
.../storage/postgresql/PostgresStorageService.java | 10 +-
.../kogito/trusty/storage/redis/IndexProvider.java | 6 +-
.../redis/RedisStorageExceptionsProviderImpl.java | 2 +-
411 files changed, 1345 insertions(+), 1273 deletions(-)
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
index 72aebeb09..ee13a5625 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
@@ -206,7 +206,7 @@ public abstract class AbstractProcessDataIndexIT {
.get("/approvals/{processId}/tasks")
.then()
.statusCode(200)
- .body("$.size()", is(1))
+ .body("size()", is(1))
.body("[0].name", is("secondLineApproval"))
.body("[0].id", notNullValue())
.extract()
@@ -473,7 +473,7 @@ public abstract class AbstractProcessDataIndexIT {
.get("/approvals/{id}/firstLineApproval/{taskId}/comments")
.then()
.statusCode(200)
- .body("$.size()", is(1))
+ .body("size()", is(1))
.body("[0].content", is(commentContent)));
await()
@@ -584,7 +584,7 @@ public abstract class AbstractProcessDataIndexIT {
.get("/approvals/{id}/firstLineApproval/{taskId}/attachments")
.then()
.statusCode(200)
- .body("$.size()", is(1))
+ .body("size()", is(1))
.body("[0].name", is(attachmentName)));
AtomicReference<Map<String, String>> attachmentMapRef = new AtomicReference<>();
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
index 49e9d2a87..ba47c3812 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
@@ -24,7 +24,7 @@ import org.kie.kogito.index.spring.DataIndexInfinispanSpringTestResource;
import org.kie.kogito.index.spring.KogitoServiceRandomPortSpringTestResource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
index 492153321..bb4b48075 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
@@ -24,7 +24,7 @@ import org.kie.kogito.index.spring.DataIndexMongoDBSpringTestResource;
import org.kie.kogito.index.spring.KogitoServiceRandomPortSpringTestResource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
index 0b760e709..a25f029bc 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
@@ -24,7 +24,7 @@ import org.kie.kogito.index.spring.DataIndexOracleSpringTestResource;
import org.kie.kogito.index.spring.KogitoServiceRandomPortSpringTestResource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
index def1ece2a..43746273c 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
@@ -24,7 +24,7 @@ import org.kie.kogito.index.spring.DataIndexPostgreSqlSpringTestResource;
import org.kie.kogito.index.spring.KogitoServiceRandomPortSpringTestResource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
index 155e810a6..d172b044d 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
@@ -21,9 +21,9 @@ package org.kie.kogito.it.trusty;
import org.junit.jupiter.api.Disabled;
import org.kie.kogito.testcontainers.QuarkusKogitoServiceContainer;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
-@NativeImageTest
+@QuarkusIntegrationTest
@Disabled("https://issues.redhat.com/browse/FAI-748")
public class NativeQuarkusTrustyExplainabilityEnd2EndIT extends AbstractTrustyExplainabilityEnd2EndIT {
diff --git a/data-index/data-index-common/pom.xml b/data-index/data-index-common/pom.xml
index f25994ad6..72a276de2 100644
--- a/data-index/data-index-common/pom.xml
+++ b/data-index/data-index-common/pom.xml
@@ -65,6 +65,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-oidc</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny-zero-flow-adapters</artifactId>
+ </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
index 11291f6ae..1b06a30b0 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.index.model.Job;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
index 5c8cd1310..a846ceb59 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.event.mapper;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
index 4984dbde8..b6c758330 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.process.ProcessInstanceNodeDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
index 9c1d1303a..f2a0cae0d 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.event.mapper;
import java.util.Set;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
index 92a2c5e79..26339c6a2 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
@@ -21,7 +21,7 @@ package org.kie.kogito.index.event.mapper;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
index 870a1d418..85f5bbd35 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.event.mapper;
import java.util.HashSet;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentEventBody;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
index 32875bf17..dce5ed2ec 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentEventBody;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
index 2d732ebfe..419a7d5b8 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceCommentEventBody;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
index 4699e3ba6..7901bcef3 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.event.mapper;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
index 77ba60c80..6b7715389 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.event.mapper;
import java.net.URI;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
index 9f256184b..3dbf7b12c 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
@@ -21,7 +21,7 @@ package org.kie.kogito.index.event.mapper;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceVariableDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
index cbe2a79ae..cbf058b55 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.json;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
index cafcab878..b63be12bf 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
@@ -26,9 +26,9 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
index e6a97e630..6bf9a3538 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
@@ -28,8 +28,7 @@ import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.api.KogitoRuntimeClient;
import org.kie.kogito.index.graphql.query.GraphQLQueryOrderByParser;
@@ -53,6 +52,7 @@ import graphql.schema.GraphQLScalarType;
import graphql.schema.GraphQLSchema;
import graphql.schema.idl.SchemaParser;
import graphql.schema.idl.TypeDefinitionRegistry;
+import jakarta.annotation.PostConstruct;
import static java.lang.String.format;
import static java.util.Collections.singletonList;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
index b1c09be8c..e114411d4 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
@@ -25,7 +25,7 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoUnit;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.index.DateTimeUtils;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
index d1d427515..2803e95b8 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.graphql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
index baaf75cbb..07a134f6a 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.graphql;
-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 graphql.GraphQL;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
index 3d4ef5377..d1f7393af 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.graphql;
-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 graphql.schema.GraphQLScalarType;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
index c8dad3201..1efe23e68 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.graphql;
import java.time.ZonedDateTime;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.arc.properties.IfBuildProperty;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
index 4c12f8458..e9d474a9e 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.graphql;
import java.time.ZonedDateTime;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.arc.properties.IfBuildProperty;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
index 762a69d7b..a71fbe802 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
@@ -18,9 +18,8 @@
*/
package org.kie.kogito.index.vertx;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import io.quarkus.arc.properties.IfBuildProperty;
import io.quarkus.vertx.web.Route;
@@ -28,7 +27,7 @@ import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.graphql.ApolloWSHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandlerOptions;
-
+import jakarta.annotation.PostConstruct;
import graphql.GraphQL;
import static io.quarkus.vertx.web.Route.HttpMethod.GET;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
index 6707ec910..e92585353 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
@@ -18,9 +18,8 @@
*/
package org.kie.kogito.index.vertx;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import io.quarkus.arc.properties.UnlessBuildProperty;
import io.quarkus.vertx.web.Route;
@@ -28,7 +27,7 @@ import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.graphql.ApolloWSHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandlerOptions;
-
+import jakarta.annotation.PostConstruct;
import graphql.GraphQL;
import static io.quarkus.vertx.web.Route.HttpMethod.GET;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
index ebaf891ad..1d4bbc355 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.core.MediaType;
import org.kie.kogito.index.api.KogitoRuntimeClient;
import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
index b6cd7a755..c56c1efcf 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.service.auth;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
index 5d20283f9..abedee5eb 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-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 org.kie.kogito.index.graphql.GraphQLObjectTypeMapper;
import org.kie.kogito.index.graphql.query.GraphQLInputObjectTypeMapper;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
index 9a5aec671..af2de1c99 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
@@ -24,8 +24,7 @@ import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.index.graphql.AbstractGraphQLSchemaManager;
import org.kie.kogito.index.graphql.query.GraphQLQueryParserRegistry;
@@ -33,6 +32,7 @@ import org.kie.kogito.index.json.DataIndexParsingException;
import org.kie.kogito.index.model.ProcessInstanceState;
import org.kie.kogito.index.service.DataIndexServiceException;
import org.kie.kogito.persistence.api.Storage;
+import jakarta.annotation.PostConstruct;
import org.reactivestreams.Publisher;
import com.fasterxml.jackson.databind.JsonNode;
@@ -49,6 +49,7 @@ import graphql.schema.idl.TypeDefinitionRegistry;
import static java.lang.String.format;
import static java.util.stream.Collectors.toList;
+import static mutiny.zero.flow.adapters.AdaptersToReactiveStreams.publisher;
import static org.kie.kogito.index.json.JsonUtils.getObjectMapper;
@ApplicationScoped
@@ -184,11 +185,11 @@ public class GraphQLSchemaManagerImpl extends AbstractGraphQLSchemaManager {
}
private DataFetcher<Publisher<ObjectNode>> objectCreatedPublisher(Supplier<Storage> cache) {
- return env -> cache.get().objectCreatedListener();
+ return env -> publisher(cache.get().objectCreatedListener());
}
private DataFetcher<Publisher<ObjectNode>> objectUpdatedPublisher(Supplier<Storage> cache) {
- return env -> cache.get().objectUpdatedListener();
+ return env -> publisher(cache.get().objectUpdatedListener());
}
private Supplier<DataIndexServiceException> cacheNotFoundException(String processId) {
@@ -196,11 +197,11 @@ public class GraphQLSchemaManagerImpl extends AbstractGraphQLSchemaManager {
}
protected DataFetcher<Publisher<ObjectNode>> getDomainModelUpdatedDataFetcher(String processId) {
- return env -> Optional.ofNullable(getCacheService().getDomainModelCache(processId)).orElseThrow(cacheNotFoundException(processId)).objectUpdatedListener();
+ return env -> publisher(Optional.ofNullable(getCacheService().getDomainModelCache(processId)).orElseThrow(cacheNotFoundException(processId)).objectUpdatedListener());
}
protected DataFetcher<Publisher<ObjectNode>> getDomainModelAddedDataFetcher(String processId) {
- return env -> Optional.ofNullable(getCacheService().getDomainModelCache(processId)).orElseThrow(cacheNotFoundException(processId)).objectCreatedListener();
+ return env -> publisher(Optional.ofNullable(getCacheService().getDomainModelCache(processId)).orElseThrow(cacheNotFoundException(processId)).objectCreatedListener());
}
protected DataFetcher<Collection<ObjectNode>> getDomainModelDataFetcher(String processId) {
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
index 074534277..7167ec72b 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
@@ -18,10 +18,10 @@
*/
package org.kie.kogito.index.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.kie.kogito.event.DataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
index 39bfb2574..ddb0d4fd6 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.service.messaging;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.event.DataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
index 54c2895b7..9afba6207 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.lang.reflect.Type;
import java.util.function.Supplier;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.kie.kogito.event.AbstractDataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
index 55271b7fa..17a67185e 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.kie.kogito.event.DataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
index a18e6a8bf..0ec38acde 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
@@ -20,9 +20,9 @@ package org.kie.kogito.index.service.vertx;
import java.util.Optional;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
index 8ef52ccc6..c950e5659 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
index 9eed26044..02541ce1c 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
@@ -18,16 +18,15 @@
*/
package org.kie.kogito.index.service;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
+import jakarta.enterprise.inject.Any;
+import jakarta.inject.Inject;
import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.index.event.KogitoJobCloudEvent;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
-
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESS_DEFINITIONS_EVENTS;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
index acceac7a1..3279f6f6a 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
@@ -29,8 +29,8 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java
index 5109b4e11..2138279a8 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java
@@ -51,8 +51,27 @@ import static org.kie.kogito.index.json.JsonUtils.getObjectMapper;
public class GraphQLUtils {
+ private static final String ID = "id";
+ private static final String VERSION = "version";
+ private static final String STATE = "state";
+ private static final String START = "start";
+ private static final String PROCESS_ID = "processId";
+ private static final String PARENT_PROCESS_INSTANCE_ID = "parentProcessInstanceId";
+ private static final String IS_NULL = "isNull";
+ private static final String NODE = "node";
+ private static final String MILESTONE = "milestone";
+ private static final String ADDON = "addon";
+ private static final String STATUS = "status";
+ private static final String BUSSINES_KEY = "bk";
+ private static final String IDENT = "ident";
+ private static final String ACTUAL_OWNER = "actualOwner";
+ private static final String STARTED = "started";
+ private static final String COMPLETED = "completed";
+ private static final String POTENTIAL_GROUPS = "potentialGroups";
+ private static final String POTENTIAL_USERS = "potentialUsers";
+
private static final Logger LOGGER = LoggerFactory.getLogger(GraphQLUtils.class);
- private static final Map<Class, String> QUERY_FIELDS = new HashMap<>();
+ private static final Map<Class<?>, String> QUERY_FIELDS = new HashMap<>();
private static final Map<String, String> QUERIES = new HashMap<>();
static {
@@ -77,115 +96,115 @@ public class GraphQLUtils {
}
public static String getProcessDefinitionByIdAndVersion(String id, String version) {
- return getProcessDefinitionQuery("ProcessDefinitionByIdAndVersion", id, version);
+ return getProcessDefinitionQuery("ProcessDefinitionByIdAndVersion", Map.of(ID, id, VERSION, version));
}
public static String getProcessInstanceById(String id) {
- return getProcessInstanceQuery("ProcessInstanceById", id);
+ return getProcessInstanceQuery("ProcessInstanceById", Map.of(ID, id));
}
public static String getProcessInstanceByIdAndState(String id, ProcessInstanceState state) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndState", id, state.name());
+ return getProcessInstanceQuery("ProcessInstanceByIdAndState", Map.of(ID, id, STATE, state.name()));
}
public static String getProcessInstanceByIdAndStart(String id, String start) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndStart", id, start);
+ return getProcessInstanceQuery("ProcessInstanceByIdAndStart", Map.of(ID, id, START, start));
}
public static String getProcessInstanceByIdAndProcessId(String id, String processId) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndProcessId", id, processId);
+ return getProcessInstanceQuery("ProcessInstanceByIdAndProcessId", Map.of(ID, id, PROCESS_ID, processId));
}
public static String getProcessInstanceByIdAndParentProcessInstanceId(String id, String parentProcessInstanceId) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndParentProcessInstanceId", id, parentProcessInstanceId);
+ return getProcessInstanceQuery("ProcessInstanceByIdAndParentProcessInstanceId", Map.of(ID, id, PARENT_PROCESS_INSTANCE_ID, parentProcessInstanceId));
}
public static String getProcessInstanceByParentProcessInstanceId(String parentProcessInstanceId) {
- return getProcessInstanceQuery("ProcessInstanceByParentProcessInstanceId", parentProcessInstanceId);
+ return getProcessInstanceQuery("ProcessInstanceByParentProcessInstanceId", Map.of(PARENT_PROCESS_INSTANCE_ID, parentProcessInstanceId));
}
public static String getProcessInstanceByIdAndNullParentProcessInstanceId(String id, Boolean isNull) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndNullParentProcessInstanceId", id, isNull.toString());
+ return getProcessInstanceQuery("ProcessInstanceByIdAndNullParentProcessInstanceId", Map.of(ID, id, IS_NULL, isNull));
}
public static String getProcessInstanceByIdAndNullRootProcessInstanceId(String id, Boolean isNull) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndNullRootProcessInstanceId", id, isNull.toString());
+ return getProcessInstanceQuery("ProcessInstanceByIdAndNullRootProcessInstanceId", Map.of(ID, id, IS_NULL, isNull));
}
public static String getProcessInstanceByRootProcessInstanceId(String rootProcessInstanceId) {
- return getProcessInstanceQuery("ProcessInstanceByRootProcessInstanceId", rootProcessInstanceId);
+ return getProcessInstanceQuery("ProcessInstanceByRootProcessInstanceId", Map.of(ID, rootProcessInstanceId));
}
public static String getProcessInstanceByIdAndErrorNode(String id, String nodeDefinitionId) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndErrorNode", id, nodeDefinitionId);
+ return getProcessInstanceQuery("ProcessInstanceByIdAndErrorNode", Map.of(ID, id, NODE, nodeDefinitionId));
}
public static String getProcessInstanceByIdAndAddon(String id, String addon) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndAddon", id, addon);
+ return getProcessInstanceQuery("ProcessInstanceByIdAndAddon", Map.of(ID, id, ADDON, addon));
}
public static String getProcessInstanceByIdAndMilestoneName(String id, String milestone) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndMilestoneName", id, milestone);
+ return getProcessInstanceQuery("ProcessInstanceByIdAndMilestoneName", Map.of(ID, id, MILESTONE, milestone));
}
public static String getProcessInstanceByIdAndMilestoneStatus(String id, String status) {
- return getProcessInstanceQuery("ProcessInstanceByIdAndMilestoneStatus", id, status);
+ return getProcessInstanceQuery("ProcessInstanceByIdAndMilestoneStatus", Map.of(ID, id, STATUS, status));
}
- public static String getProcessInstanceByBusinessKey(String businessKeys) {
- return getProcessInstanceQuery("ProcessInstanceByBusinessKey", businessKeys);
+ public static String getProcessInstanceByBusinessKey(String businessKey) {
+ return getProcessInstanceQuery("ProcessInstanceByBusinessKey", Map.of(BUSSINES_KEY, businessKey));
}
public static String getProcessInstanceByCreatedBy(String identity) {
- return getProcessInstanceQuery("ProcessInstanceByCreatedBy", identity);
+ return getProcessInstanceQuery("ProcessInstanceByCreatedBy", Map.of(IDENT, identity));
}
public static String getProcessInstanceByUpdatedBy(String identity) {
- return getProcessInstanceQuery("ProcessInstanceByUpdatedBy", identity);
+ return getProcessInstanceQuery("ProcessInstanceByUpdatedBy", Map.of(IDENT, identity));
}
public static String getUserTaskInstanceById(String id) {
- return getUserTaskInstanceQuery("UserTaskInstanceById", id);
+ return getUserTaskInstanceQuery("UserTaskInstanceById", Map.of(ID, id));
}
public static String getUserTaskInstanceByProcessInstanceId(String id) {
- return getUserTaskInstanceQuery("UserTaskInstanceByProcessInstanceId", id);
+ return getUserTaskInstanceQuery("UserTaskInstanceByProcessInstanceId", Map.of(ID, id));
}
public static String getUserTaskInstanceByIdAndActualOwner(String id, String actualOwner) {
- return getUserTaskInstanceQuery("UserTaskInstanceByIdAndActualOwner", id, actualOwner);
+ return getUserTaskInstanceQuery("UserTaskInstanceByIdAndActualOwner", Map.of(ID, id, ACTUAL_OWNER, actualOwner));
}
public static String getUserTaskInstanceByIdAndProcessId(String id, String processId) {
- return getUserTaskInstanceQuery("UserTaskInstanceByIdAndProcessId", id, processId);
+ return getUserTaskInstanceQuery("UserTaskInstanceByIdAndProcessId", Map.of(ID, id, PROCESS_ID, processId));
}
public static String getUserTaskInstanceByIdNoActualOwner(String id) {
- return getUserTaskInstanceQuery("UserTaskInstanceByIdNoActualOwner", id);
+ return getUserTaskInstanceQuery("UserTaskInstanceByIdNoActualOwner", Map.of(ID, id));
}
public static String getUserTaskInstanceByIdAndState(String id, String state) {
- return getUserTaskInstanceQuery("UserTaskInstanceByIdAndState", id, state);
+ return getUserTaskInstanceQuery("UserTaskInstanceByIdAndState", Map.of(ID, id, STATE, state));
}
public static String getUserTaskInstanceByIdAndStarted(String id, String started) {
- return getUserTaskInstanceQuery("UserTaskInstanceByIdAndStarted", id, started);
+ return getUserTaskInstanceQuery("UserTaskInstanceByIdAndStarted", Map.of(ID, id, STARTED, started));
}
public static String getUserTaskInstanceByIdAndCompleted(String id, String completed) {
- return getUserTaskInstanceQuery("UserTaskInstanceByIdAndCompleted", id, completed);
+ return getUserTaskInstanceQuery("UserTaskInstanceByIdAndCompleted", Map.of(ID, id, COMPLETED, completed));
}
public static String getUserTaskInstanceByIdAndPotentialGroups(String id, List<String> potentialGroups) throws Exception {
- return getUserTaskInstanceWithArray("UserTaskInstanceByIdAndPotentialGroups", potentialGroups, "potentialGroups", id);
+ return getUserTaskInstanceWithArray("UserTaskInstanceByIdAndPotentialGroups", potentialGroups, POTENTIAL_GROUPS, Map.of(ID, id));
}
public static String getUserTaskInstanceByIdAndPotentialUsers(String id, List<String> potentialUsers) throws Exception {
- return getUserTaskInstanceWithArray("UserTaskInstanceByIdAndPotentialUsers", potentialUsers, "potentialUsers", id);
+ return getUserTaskInstanceWithArray("UserTaskInstanceByIdAndPotentialUsers", potentialUsers, POTENTIAL_USERS, Map.of(ID, id));
}
public static String getJobById(String id) {
- return getJobQuery("JobById", id);
+ return getJobQuery("JobById", Map.of(ID, id));
}
public static String getTravelsByUserTaskId(String id) {
@@ -208,7 +227,7 @@ public class GraphQLUtils {
return getQuery("DealsByTaskIdNoActualOwner", id);
}
- private static String getUserTaskInstanceWithArray(String query, List<String> values, String variable, String... args) throws Exception {
+ private static String getUserTaskInstanceWithArray(String query, List<String> values, String variable, Map<String, Object> args) throws Exception {
String json = getUserTaskInstanceQuery(query, args);
ObjectNode jsonNode = (ObjectNode) getObjectMapper().readTree(json);
ArrayNode pg = (ArrayNode) jsonNode.get("variables").get(variable);
@@ -220,24 +239,32 @@ public class GraphQLUtils {
return format(QUERIES.get(name), args);
}
- private static String getProcessInstanceQuery(String name, String... args) {
+ private static String getProcessInstanceQuery(String name, Map<String, Object> args) {
return getQuery(name, ProcessInstance.class, args);
}
- private static String getProcessDefinitionQuery(String name, String... args) {
+ private static String getProcessDefinitionQuery(String name, Map<String, Object> args) {
return getQuery(name, ProcessDefinition.class, args);
}
- private static String getUserTaskInstanceQuery(String name, String... args) {
+ private static String getUserTaskInstanceQuery(String name, Map<String, Object> args) {
return getQuery(name, UserTaskInstance.class, args);
}
- private static String getJobQuery(String name, String... args) {
+ private static String getJobQuery(String name, Map<String, Object> args) {
return getQuery(name, Job.class, args);
}
- private static String getQuery(String name, Class clazz, String... args) {
- return format(QUERIES.get(name), insert(0, args, QUERY_FIELDS.get(clazz)));
+ private static String getQuery(String name, Class<?> clazz, Map<String, Object> args) {
+ try {
+ String query = format(QUERIES.get(name), QUERY_FIELDS.get(clazz));
+ JsonNode jsonQuery = getObjectMapper().readTree(query);
+ ObjectNode jsonVars = getObjectMapper().valueToTree(args);
+ jsonQuery.withObject("/variables").setAll(jsonVars);
+ return jsonQuery.toString();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
private static Stream<Field> getAllFieldsList(Class clazz) {
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
index 8fc93d4bf..dd2d66e85 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
@@ -22,7 +22,7 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
index f38c8a9b3..8989e0eac 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
@@ -22,7 +22,7 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
index a577e9858..ed5e3c0a3 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
@@ -24,7 +24,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
index 0dfd09e61..edda090aa 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
@@ -24,7 +24,7 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.service.graphql.GraphQLSchemaManagerImpl;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
index f9dc10f1e..07ae841a5 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
index 06bbe2dbb..a85eae7f6 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
@@ -21,7 +21,7 @@ package org.kie.kogito.index.service.messaging;
import java.time.Duration;
import java.util.Collection;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
index 3dde99da4..46732f9c8 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
@@ -18,15 +18,14 @@
*/
package org.kie.kogito.index.service.messaging;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
+import jakarta.enterprise.inject.Any;
+import jakarta.inject.Inject;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.index.model.ProcessInstanceState;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
-
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
import static org.kie.kogito.index.test.TestUtils.getProcessCloudEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
index d462d8894..1aced8fec 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.service.messaging;
import java.time.Duration;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
index 1f1a4aed3..b3ba54ec5 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
@@ -18,8 +18,9 @@
*/
package org.kie.kogito.index.service.messaging;
-import javax.enterprise.inject.Any;
-import javax.inject.Inject;
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
+import jakarta.enterprise.inject.Any;
+import jakarta.inject.Inject;
import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
@@ -28,8 +29,6 @@ import org.kie.kogito.index.event.KogitoJobCloudEvent;
import org.kie.kogito.index.json.JsonUtils;
import org.kie.kogito.index.model.ProcessInstanceState;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
-
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESS_DEFINITIONS_EVENTS;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
index fd97ba148..ac4edd255 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
@@ -25,7 +25,7 @@ import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
index 064c4f211..d311e3036 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.eclipse.microprofile.reactive.messaging.Metadata;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
index 3669c0550..81415cdbc 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.service.messaging;
import java.util.UUID;
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
index f23cffea3..721ae09fc 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
@@ -23,7 +23,8 @@ import java.util.Map;
import java.util.stream.Stream;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
+
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/graphql_queries.json b/data-index/data-index-service/data-index-service-common/src/test/resources/graphql_queries.json
index afc269c6e..543f91bc4 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/resources/graphql_queries.json
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/graphql_queries.json
@@ -1,219 +1,134 @@
{
"ProcessDefinitionByIdAndVersion": {
"query": "query ($id: String, $version: String) { ProcessDefinitions( where: { id: { equal : $id }, version: { equal : $version } }, orderBy: { version: ASC }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s",
- "version": "%s"
- }
+ "variables": {}
},
"ProcessInstanceById": {
"query": "query ($id: String) { ProcessInstances( where: { id: { equal : $id } }, orderBy: { lastUpdate: ASC }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndState": {
"query": "query ($id: String, $state: ProcessInstanceState) { ProcessInstances( where: { id: { equal : $id }, state: { equal : $state } }, orderBy: { lastUpdate: ASC }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s",
- "state": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndAddon": {
"query": "query ($id: String, $addon: String) { ProcessInstances( where: { id: { equal : $id }, addons: { contains : $addon } }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s",
- "addon": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndMilestoneName": {
"query": "query ($id: String, $milestone: String) { ProcessInstances( where: { id: { equal : $id }, milestones: { name : { equal : $milestone } } }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s",
- "milestone": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndMilestoneStatus": {
"query": "query ($id: String, $status: MilestoneStatus) { ProcessInstances( where: { id: { equal : $id }, milestones: { status : { equal : $status } } }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s",
- "status": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndStart": {
"query": "query ($id: String, $start: DateTime) { ProcessInstances( where: { id: { equal : $id }, start: { equal : $start } }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s",
- "start": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndProcessId": {
"query": "query ($id: String, $processId: String) { ProcessInstances( where: { id: { equal : $id }, processId: { equal : $processId } }, pagination : { limit: 10, offset: 0 } ){ %s } }",
- "variables": {
- "id": "%s",
- "processId": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByParentProcessInstanceId": {
"query": "query ( $parentProcessInstanceId: String ) { ProcessInstances( where: { parentProcessInstanceId: { equal : $parentProcessInstanceId } } ){ %s } }",
- "variables": {
- "parentProcessInstanceId": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndNullParentProcessInstanceId": {
"query": "query ( $id: String, $isNull: Boolean ) { ProcessInstances( where: { id: { equal : $id }, parentProcessInstanceId: { isNull : $isNull } } ){ %s } }",
- "variables": {
- "id": "%s",
- "isNull": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndParentProcessInstanceId": {
"query": "query ( $id: String, $parentProcessInstanceId: String ) { ProcessInstances( where: { id: { equal : $id }, parentProcessInstanceId: { equal : $parentProcessInstanceId } } ){ %s } }",
- "variables": {
- "id": "%s",
- "parentProcessInstanceId": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByRootProcessInstanceId": {
"query": "query ( $id: String ) { ProcessInstances( where: { rootProcessInstanceId: { equal : $id } } ){ %s } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndNullRootProcessInstanceId": {
"query": "query ( $id: String, $isNull: Boolean ) { ProcessInstances( where: { id: { equal : $id }, rootProcessInstanceId: { isNull : $isNull } } ){ %s } }",
- "variables": {
- "id": "%s",
- "isNull": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByIdAndErrorNode": {
"query": "query ( $id: String, $node: String ) { ProcessInstances( where: { id: { equal : $id }, error : { nodeDefinitionId: { equal : $node } } }, orderBy: { error: { message: ASC }, lastUpdate: ASC } ){ %s } }",
- "variables": {
- "id": "%s",
- "node": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByBusinessKey": {
"query": "query ( $bk: [String!] ) { ProcessInstances(where: { businessKey : { in : $bk } }) { %s } }",
- "variables": {
- "bk": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByCreatedBy": {
"query": "query ( $ident: String ) { ProcessInstances(where: { createdBy : { equal : $ident } }) { %s } }",
- "variables": {
- "ident": "%s"
- }
+ "variables": {}
},
"ProcessInstanceByUpdatedBy": {
"query": "query ( $ident: String ) { ProcessInstances(where: { updatedBy : { equal : $ident } }) { %s } }",
- "variables": {
- "ident": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceById": {
"query": "query ( $id: String ) { UserTaskInstances( where: { id: { equal : $id } } ){ %s } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByProcessInstanceId": {
"query": "query ( $id: String ) { UserTaskInstances( where: { processInstanceId: { equal : $id } } ){ %s } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByIdAndActualOwner": {
"query": "query ( $id: String, $actualOwner: String ) { UserTaskInstances( where: { id: { equal : $id }, actualOwner: { equal: $actualOwner }, not: { excludedUsers: { contains : $actualOwner } } } ){ %s } }",
- "variables": {
- "id": "%s",
- "actualOwner": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByIdAndProcessId": {
"query": "query ( $id: String, $processId: String ) { UserTaskInstances( where: { id: { equal : $id }, processId: { equal: $processId } } ){ %s } }",
- "variables": {
- "id": "%s",
- "processId": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByIdNoActualOwner": {
"query": "query ( $id: String ) { UserTaskInstances( where: { id: { equal : $id }, actualOwner: { isNull: true } } ){ %s } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByIdAndState": {
"query": "query ( $id: String, $state: String ) { UserTaskInstances( where: { id: { equal : $id }, state: { equal: $state } } ){ %s } }",
- "variables": {
- "id": "%s",
- "state": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByIdAndStarted": {
"query": "query ( $id: String, $started: DateTime ) { UserTaskInstances( where: { id: { equal : $id }, started: { lessThanEqual: $started } } ){ %s } }",
- "variables": {
- "id": "%s",
- "started": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByIdAndCompleted": {
"query": "query ( $id: String, $completed: DateTime ) { UserTaskInstances( where: { id: { equal : $id }, completed: { greaterThanEqual: $completed } } ){ %s } }",
- "variables": {
- "id": "%s",
- "completed": "%s"
- }
+ "variables": {}
},
"UserTaskInstanceByIdAndPotentialGroups": {
"query": "query ( $id: String, $potentialGroups: [String!] ) { UserTaskInstances( where: { id: { equal : $id }, potentialGroups: { containsAny: $potentialGroups } } ){ %s } }",
- "variables": {
- "id": "%s",
- "potentialGroups": []
- }
+ "variables": {}
},
"UserTaskInstanceByIdAndPotentialUsers": {
"query": "query ( $id: String, $potentialUsers: [String!] ) { UserTaskInstances( where: { id: { equal : $id }, potentialUsers: { containsAny: $potentialUsers } } ){ %s } }",
- "variables": {
- "id": "%s",
- "potentialUsers": []
- }
+ "variables": {}
},
"JobById": {
"query": "query ( $id: String ) { Jobs( where: { id: { equal : $id } } ){ %s } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"TravelsByUserTaskId": {
"query": "query ( $taskId: String ) { Travels ( where: { metadata: { userTasks: { id : { equal : $taskId } } } } ){ id, __typename, flight { flightNumber, arrival, departure }, hotel { name }, traveller { firstName }, metadata { lastUpdate, processInstances { id, processId, processName, rootProcessId, rootProcessInstanceId, parentProcessInstanceId, start, end, lastUpdate, endpoint, serviceUrl }, userTasks { id, description, name, priority, processInstanceId, actualOwner, lastUpdate, [...]
- "variables": {
- "taskId": "%s"
- }
+ "variables": {}
},
"TravelsByProcessInstanceId": {
"query": "query ( $id: String ) { Travels ( where: { metadata: { processInstances : { id : { equal : $id } } } }){ id, __typename, flight { flightNumber, arrival, departure }, hotel { name }, traveller { firstName, email, nationality, locations { city, street, country, zipCode }, aliases}, metadata { lastUpdate, processInstances { id, processId, processName, rootProcessId, rootProcessInstanceId, parentProcessInstanceId, state, start, end, endpoint, serviceUrl, lastUpdate }, userTask [...]
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"TravelsByProcessInstanceIdAndTravellerFirstName": {
"query": "query ( $id: String, $name: String ) { Travels ( where: { metadata : { processInstances : { id : { equal : $id } } }, traveller : { firstName : { like : $name } } }){ id, flight { flightNumber, arrival, departure }, hotel { name }, traveller { firstName, email, nationality }, metadata { lastUpdate, processInstances { id, processId, processName, rootProcessId, rootProcessInstanceId, parentProcessInstanceId, start, end, endpoint, serviceUrl, lastUpdate } } } }",
- "variables": {
- "id": "%s",
- "name": "%s"
- }
+ "variables": {}
},
"DealsByTaskId": {
"query": "query ( $id: String ) { Deals ( where: { metadata : { userTasks : { id : { equal : $id } } } } ){ id, __typename, name, review, metadata { lastUpdate, userTasks { id, description, state, name, priority, processInstanceId, actualOwner, started, completed, lastUpdate } } } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
},
"DealsByTaskIdNoActualOwner": {
"query": "query ( $id: String ) { Deals ( where: { metadata : { userTasks : { id : { equal : $id }, actualOwner: { isNull: true } } } } ){ id, __typename, name, review, metadata { lastUpdate, userTasks { id, description, state, name, priority, processInstanceId, actualOwner, started, completed, lastUpdate } } } }",
- "variables": {
- "id": "%s"
- }
+ "variables": {}
}
}
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
index 58f04a1be..2d1352fbd 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
index b977cc090..95a73b29c 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
@@ -18,10 +18,10 @@
*/
package org.kie.kogito.index.infinispan;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
import org.kie.kogito.index.storage.DataIndexStorageService;
import io.quarkus.runtime.Startup;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
index 09d4ba980..313ea4438 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.infinispan.protostream;
-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 org.infinispan.protostream.MessageMarshaller;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
index 030bcd308..caade14ec 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.infinispan.schema;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.api.schema.SchemaAcceptor;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
index e468429a7..00405ac14 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
@@ -21,9 +21,9 @@ package org.kie.kogito.index.infinispan.schema;
import java.util.ArrayList;
import java.util.List;
-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 org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.commons.configuration.XMLStringConfiguration;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
index aae8a0de9..ca632a4d4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
@@ -18,14 +18,14 @@
*/
package org.kie.kogito.index.mongodb.storage;
+import jakarta.annotation.PostConstruct;
import java.util.Map;
import java.util.Objects;
import java.util.function.Supplier;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
index 821db8cb6..d5d1c6b37 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
@@ -18,10 +18,10 @@
*/
package org.kie.kogito.index.mongodb.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.kie.kogito.index.storage.DataIndexStorageService;
import org.kie.kogito.persistence.mongodb.index.IndexCreateOrUpdateEvent;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
index 58b44ecdb..29f8f383a 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
@@ -20,8 +20,8 @@ package org.kie.kogito.index.mongodb.mock;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import org.kie.kogito.persistence.mongodb.index.IndexCreateOrUpdateEvent;
import org.mockito.Mockito;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
index d7b27ffb1..f7aa6ad50 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.query;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
index 5dce2a361..75cfa5cc1 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.Job;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
index db78b8470..b570feab4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
index 1c3330bb1..b3fd19d3d 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.mongodb.model.ProcessIdEntity;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
index e6db6b9af..22b968701 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.ProcessInstance;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
index e7149a0af..4eba34451 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.UserTaskInstance;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
index c31ddfc9a..4d170d136 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
index 088d6ccfa..d06f876c4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
index 7744351fb..0e68d9fa4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.storage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
index 2c669e5c8..705b74121 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
index d19db523e..b39813b30 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.storage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
index 029734653..f2ae68498 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.mongodb.storage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
index 04bd7bb6c..42e4e7ef0 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
index 3f3b95df0..141226ba2 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
index 81e8fb2f2..b989f88f8 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
@@ -21,12 +21,12 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
@Entity(name = "attachments")
@Table(name = "attachments")
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
index 03e06e35b..089393a66 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
@@ -21,12 +21,12 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
@Entity(name = "comments")
@Table(name = "comments")
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
index 7082fa32e..a970ad43d 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
@@ -21,9 +21,9 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
@Entity(name = "jobs")
@Table(name = "jobs")
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
index f2ae36f77..3182fcc9e 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
index b943daa6e..ce93b82a3 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
@@ -20,14 +20,14 @@ package org.kie.kogito.index.oracle.model;
import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
index a1807c850..35006acdb 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
@@ -21,19 +21,19 @@ package org.kie.kogito.index.oracle.model;
import java.util.Map;
import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
index 57650f4e8..fb39316ec 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
@@ -21,13 +21,13 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
index 9e7703b50..f93b6e4e5 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
@@ -23,18 +23,17 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
index f301ca0a0..93b855f3f 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
index 65dbfd9f4..c7ea6b341 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
@@ -23,29 +23,27 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.vladmihalcea.hibernate.type.json.JsonBlobType;
+import org.kie.kogito.persistence.oracle.hibernate.JsonBinaryType;
@Entity(name = "processes")
@Table(name = "processes")
-@TypeDef(name = "jsonb", typeClass = JsonBlobType.class)
public class ProcessInstanceEntity extends AbstractEntity {
@Id
@@ -75,7 +73,7 @@ public class ProcessInstanceEntity extends AbstractEntity {
private String createdBy;
@Column(name = "updated_by")
private String updatedBy;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
private ObjectNode variables;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "processInstance")
private List<NodeInstanceEntity> nodes;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
index 5e50438b7..0e0702e09 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
index 894847308..5d51525ea 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.model;
import java.util.Objects;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
@Embeddable
public class ProcessInstanceErrorEntity {
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
index cad8138f3..965a753b3 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
@@ -23,28 +23,27 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.vladmihalcea.hibernate.type.json.JsonBlobType;
+
+import org.kie.kogito.persistence.oracle.hibernate.JsonBinaryType;
@Entity(name = "tasks")
-@TypeDef(name = "jsonb", typeClass = JsonBlobType.class)
@Table(name = "tasks")
public class UserTaskInstanceEntity extends AbstractEntity {
@@ -93,9 +92,9 @@ public class UserTaskInstanceEntity extends AbstractEntity {
private String processId;
private String rootProcessId;
private String rootProcessInstanceId;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
private ObjectNode inputs;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
private ObjectNode outputs;
private String endpoint;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask", orphanRemoval = true, fetch = FetchType.LAZY)
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
index 9a2659f67..5a369e560 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
index d319ee18c..d1f2479b6 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
@@ -22,9 +22,9 @@ import java.util.ConcurrentModificationException;
import java.util.Map;
import java.util.function.Function;
-import javax.persistence.LockModeType;
-import javax.persistence.PersistenceException;
-import javax.transaction.Transactional;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PersistenceException;
+import jakarta.transaction.Transactional;
import org.kie.kogito.index.oracle.model.AbstractEntity;
import org.kie.kogito.persistence.api.Storage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
index 877abe5f3..ab6dad0ee 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.oracle.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.oracle.mapper.JobEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
index 24beb9672..dca6217b4 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
@@ -22,15 +22,15 @@ import java.util.Collection;
import java.util.List;
import java.util.function.Function;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.hibernate.query.criteria.internal.path.PluralAttributePath;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.metamodel.Attribute;
+
import org.kie.kogito.index.oracle.model.AbstractEntity;
import org.kie.kogito.persistence.api.query.AttributeFilter;
import org.kie.kogito.persistence.api.query.AttributeSort;
@@ -98,7 +98,7 @@ public class OracleQuery<E extends AbstractEntity, T> implements Query<T> {
criteriaQuery.orderBy(orderBy);
}
- javax.persistence.Query query = repository.getEntityManager().createQuery(criteriaQuery);
+ jakarta.persistence.Query query = repository.getEntityManager().createQuery(criteriaQuery);
if (limit != null) {
query.setMaxResults(limit);
@@ -137,10 +137,10 @@ public class OracleQuery<E extends AbstractEntity, T> implements Query<T> {
return builder.equal(getAttributePath(root, attribute), value);
case IS_NULL:
Path pathNull = getAttributePath(root, attribute);
- return pathNull instanceof PluralAttributePath ? builder.isEmpty(pathNull) : builder.isNull(pathNull);
+ return isPluralAttribute(attribute) ? builder.isEmpty(pathNull) : builder.isNull(pathNull);
case NOT_NULL:
Path pathNotNull = getAttributePath(root, attribute);
- return pathNotNull instanceof PluralAttributePath ? builder.isNotEmpty(pathNotNull) : builder.isNotNull(pathNotNull);
+ return isPluralAttribute(attribute) ? builder.isNotEmpty(pathNotNull) : builder.isNotNull(pathNotNull);
case BETWEEN:
List<Object> v = (List<Object>) value;
return builder.between(getAttributePath(root, attribute), (Comparable) v.get(0),
@@ -179,6 +179,11 @@ public class OracleQuery<E extends AbstractEntity, T> implements Query<T> {
return join.get(split[split.length - 1]);
}
+ private boolean isPluralAttribute(final String attribute) {
+ return this.repository.getEntityManager().getMetamodel().entity(this.entityClass).getDeclaredPluralAttributes().stream()
+ .map(Attribute::getName)
+ .anyMatch(pluralAttribute -> pluralAttribute.equals(attribute));
+ }
private List<Predicate> getRecursivePredicate(AttributeFilter<?> filter, Root<E> root, CriteriaBuilder builder) {
return ((List<AttributeFilter<?>>) filter.getValue())
.stream()
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
index af2056e27..efadb2929 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
@@ -18,8 +18,10 @@
*/
package org.kie.kogito.index.oracle.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
@@ -28,14 +30,14 @@ import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
-import io.quarkus.arc.AlternativePriority;
import io.quarkus.arc.properties.IfBuildProperty;
import static java.lang.String.format;
import static org.kie.kogito.persistence.api.factory.Constants.PERSISTENCE_TYPE_PROPERTY;
import static org.kie.kogito.persistence.oracle.Constants.ORACLE_STORAGE;
-@AlternativePriority(1)
+@Alternative
+@Priority(1)
@ApplicationScoped
@IfBuildProperty(name = PERSISTENCE_TYPE_PROPERTY, stringValue = ORACLE_STORAGE)
public class OracleStorageService implements StorageService {
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
index 48478e265..e2deddebb 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
@@ -20,10 +20,10 @@ package org.kie.kogito.index.oracle.storage;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.oracle.mapper.ProcessDefinitionEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
index 587a76a75..294e31ff3 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.oracle.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.oracle.mapper.ProcessInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
index 50bc2ac5e..87ea6a547 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.oracle.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.oracle.mapper.UserTaskInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
index 61f265918..960c7b577 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.mapper;
import java.time.ZonedDateTime;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
index 669ad5a5d..6f46dda29 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.mapper;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
index c521f56d7..0a8e3fb15 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
@@ -21,7 +21,7 @@ package org.kie.kogito.index.oracle.mapper;
import java.time.ZonedDateTime;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
index 7e6cdfebc..800783e58 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
index 1df635219..b909391d0 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.oracle.storage.JobEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
index 5da3effc8..3f0b67305 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.oracle.storage.ProcessDefinitionEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
index e174e9361..c168c9418 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.oracle.storage.ProcessInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
index a3ecedcce..4d9b8eac5 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.oracle.storage.UserTaskInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java
index cdcd3cde9..a47fba0db 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java
@@ -46,7 +46,7 @@ public class DDLSchemaExporter {
public static void main(String[] args) {
try (KogitoOracleSqlContainer oracleSql = new KogitoOracleSqlContainer()) {
oracleSql.start();
- Map<String, String> settings = new HashMap<>();
+ Map<String, Object> settings = new HashMap<>();
settings.put(Environment.URL, oracleSql.getJdbcUrl());
settings.put(Environment.USER, oracleSql.getUsername());
settings.put(Environment.PASS, oracleSql.getPassword());
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
index 46b34dd5c..33b1b6f55 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
@@ -21,14 +21,14 @@ package org.kie.kogito.index.oracle.storage;
import java.util.List;
import java.util.function.Function;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
index 70ccd3e3d..c9120a2e2 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
index 644bc7a2e..aa2112a3c 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
index 52cdb10a4..bf028a67b 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
index bfeff81a7..7ff6ed545 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
index bbbdd80bd..201ee5ae9 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
@@ -21,9 +21,9 @@ package org.kie.kogito.index.postgresql.reporting.database;
import java.util.Locale;
import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
import org.kie.kogito.index.postgresql.model.JobEntityRepository;
import org.kie.kogito.index.postgresql.model.ProcessInstanceEntityRepository;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
index 2fac53c23..6c519d138 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
@@ -20,14 +20,14 @@ package org.kie.kogito.index.postgresql.reporting;
import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityResult;
-import javax.persistence.FieldResult;
-import javax.persistence.Id;
-import javax.persistence.SqlResultSetMapping;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityResult;
+import jakarta.persistence.FieldResult;
+import jakarta.persistence.Id;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
index d49e0098d..1ae039145 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.reporting.database;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
index 5a628288e..0154f4dcb 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
@@ -21,12 +21,12 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
@Entity(name = "attachments")
@Table(name = "attachments")
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
index cdce6fdf6..e1cea6931 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
@@ -21,12 +21,12 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
@Entity(name = "comments")
@Table(name = "comments")
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
index 5abe45657..106015f72 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
@@ -21,9 +21,9 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
@Entity(name = "jobs")
@Table(name = "jobs")
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
index a6539a864..334402f28 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
index 74b97b526..17dbbeb1a 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
@@ -20,14 +20,14 @@ package org.kie.kogito.index.postgresql.model;
import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
index 33df9215d..7e07a67b0 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
@@ -21,19 +21,19 @@ package org.kie.kogito.index.postgresql.model;
import java.util.Map;
import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
index d078189ca..06f3a8ba8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
@@ -21,13 +21,13 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
index 9da7d4c2b..69aa8b38f 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
@@ -23,18 +23,17 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
index 3e938f32f..51735428a 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
index cbb679946..fac15ead3 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
@@ -23,28 +23,26 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
import org.kie.kogito.persistence.postgresql.hibernate.JsonBinaryType;
import com.fasterxml.jackson.databind.node.ObjectNode;
@Entity(name = "processes")
-@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
@Table(name = "processes")
public class ProcessInstanceEntity extends AbstractEntity {
@@ -74,7 +72,7 @@ public class ProcessInstanceEntity extends AbstractEntity {
private String createdBy;
private String updatedBy;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
@Column(columnDefinition = "jsonb")
private ObjectNode variables;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "processInstance")
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
index fd0be9cb1..9d544616b 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
index 14b235434..b4dca9fe2 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.model;
import java.util.Objects;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
@Embeddable
public class ProcessInstanceErrorEntity {
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
index 99fbd674e..e8abc279b 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
@@ -23,28 +23,26 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
import org.kie.kogito.persistence.postgresql.hibernate.JsonBinaryType;
import com.fasterxml.jackson.databind.node.ObjectNode;
@Entity(name = "tasks")
-@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
@Table(name = "tasks")
public class UserTaskInstanceEntity extends AbstractEntity {
@@ -93,10 +91,10 @@ public class UserTaskInstanceEntity extends AbstractEntity {
private String processId;
private String rootProcessId;
private String rootProcessInstanceId;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
@Column(columnDefinition = "jsonb")
private ObjectNode inputs;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
@Column(columnDefinition = "jsonb")
private ObjectNode outputs;
private String endpoint;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
index b5f77f7b2..6a68b42e7 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
index dd4135b02..0bc877b87 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
@@ -22,9 +22,9 @@ import java.util.ConcurrentModificationException;
import java.util.Map;
import java.util.function.Function;
-import javax.persistence.LockModeType;
-import javax.persistence.PersistenceException;
-import javax.transaction.Transactional;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PersistenceException;
+import jakarta.transaction.Transactional;
import org.kie.kogito.index.postgresql.model.AbstractEntity;
import org.kie.kogito.persistence.api.Storage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
index a738deb08..bd048e95d 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.postgresql.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.postgresql.mapper.JobEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
index da5d5dd54..1df737162 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
@@ -22,15 +22,15 @@ import java.util.Collection;
import java.util.List;
import java.util.function.Function;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.hibernate.query.criteria.internal.path.PluralAttributePath;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.metamodel.Attribute;
+
import org.kie.kogito.index.postgresql.model.AbstractEntity;
import org.kie.kogito.persistence.api.query.AttributeFilter;
import org.kie.kogito.persistence.api.query.AttributeSort;
@@ -98,7 +98,7 @@ public class PostgreSqlQuery<K, E extends AbstractEntity, T> implements Query<T>
criteriaQuery.orderBy(orderBy);
}
- javax.persistence.Query query = repository.getEntityManager().createQuery(criteriaQuery);
+ jakarta.persistence.Query query = repository.getEntityManager().createQuery(criteriaQuery);
if (limit != null) {
query.setMaxResults(limit);
@@ -135,10 +135,10 @@ public class PostgreSqlQuery<K, E extends AbstractEntity, T> implements Query<T>
return builder.equal(getAttributePath(root, filter.getAttribute()), filter.getValue());
case IS_NULL:
Path pathNull = getAttributePath(root, filter.getAttribute());
- return pathNull instanceof PluralAttributePath ? builder.isEmpty(pathNull) : builder.isNull(pathNull);
+ return isPluralAttribute(filter.getAttribute()) ? builder.isEmpty(pathNull) : builder.isNull(pathNull);
case NOT_NULL:
Path pathNotNull = getAttributePath(root, filter.getAttribute());
- return pathNotNull instanceof PluralAttributePath ? builder.isNotEmpty(pathNotNull) : builder.isNotNull(pathNotNull);
+ return isPluralAttribute(filter.getAttribute()) ? builder.isNotEmpty(pathNotNull) : builder.isNotNull(pathNotNull);
case BETWEEN:
List<Object> value = (List<Object>) filter.getValue();
return builder
@@ -179,6 +179,12 @@ public class PostgreSqlQuery<K, E extends AbstractEntity, T> implements Query<T>
return join.get(split[split.length - 1]);
}
+ private boolean isPluralAttribute(final String attribute) {
+ return this.repository.getEntityManager().getMetamodel().entity(this.entityClass).getDeclaredPluralAttributes().stream()
+ .map(Attribute::getName)
+ .anyMatch(pluralAttribute -> pluralAttribute.equals(attribute));
+ }
+
private List<Predicate> getRecursivePredicate(AttributeFilter<?> filter, Root<E> root, CriteriaBuilder builder) {
return ((List<AttributeFilter<?>>) filter.getValue())
.stream()
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
index 413e0a2b7..93bb36faf 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
@@ -18,8 +18,10 @@
*/
package org.kie.kogito.index.postgresql.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
@@ -28,14 +30,14 @@ import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
-import io.quarkus.arc.AlternativePriority;
import io.quarkus.arc.properties.IfBuildProperty;
import static java.lang.String.format;
import static org.kie.kogito.persistence.api.factory.Constants.PERSISTENCE_TYPE_PROPERTY;
import static org.kie.kogito.persistence.postgresql.Constants.POSTGRESQL_STORAGE;
-@AlternativePriority(1)
+@Alternative
+@Priority(1)
@ApplicationScoped
@IfBuildProperty(name = PERSISTENCE_TYPE_PROPERTY, stringValue = POSTGRESQL_STORAGE)
public class PostgreSqlStorageService implements StorageService {
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
index 38d60c065..aaa6adc55 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
@@ -20,11 +20,11 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
+import jakarta.transaction.Transactional;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.postgresql.mapper.ProcessDefinitionEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
index 12e3960b0..c7c14fb45 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.postgresql.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.postgresql.mapper.ProcessInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
index ed7281b75..de4b8d82e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.postgresql.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.postgresql.mapper.UserTaskInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
index 96a36f757..c717d12dd 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.mapper;
import java.time.ZonedDateTime;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
index 8fbb3ed04..ec398cf6b 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.mapper;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
index 14a7d89b5..2dc951cf8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
@@ -21,7 +21,7 @@ package org.kie.kogito.index.postgresql.mapper;
import java.time.ZonedDateTime;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
index 9d0a71005..d538c75b1 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
index abfe0411e..972aeca6e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.postgresql.storage.JobEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
index 3cbb177ac..c9374c38f 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.postgresql.storage.ProcessDefinitionEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
index f8fe9be76..53ebea212 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.postgresql.storage.ProcessInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
index 126f642b3..8c63e274c 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.postgresql.storage.UserTaskInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
index 6022ec688..84fc01702 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
@@ -49,7 +49,7 @@ public class DDLSchemaExporter {
try (KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer()) {
postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
postgresql.start();
- Map<String, String> settings = new HashMap<>();
+ Map<String, Object> settings = new HashMap<>();
settings.put(Environment.URL, postgresql.getJdbcUrl());
settings.put(Environment.USER, postgresql.getUsername());
settings.put(Environment.PASS, postgresql.getPassword());
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
index c39f5e2f6..a36748515 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
@@ -21,14 +21,14 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.List;
import java.util.function.Function;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
index b3845d834..6d11639ef 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
index 111d71d41..024da5368 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
index 326229c13..cb0fda630 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
index f64359fdf..a866610a8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java b/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
index f08e7b057..4bb9854bb 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
+++ b/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
@@ -20,8 +20,8 @@ package org.kie.kogito.index.protobuf;
import java.io.IOException;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
import org.infinispan.protostream.FileDescriptorSource;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
index d8bcd1509..df0edd6e9 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Collection;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
import org.kie.kogito.event.DataEvent;
import org.kie.kogito.event.EventPublisher;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java
new file mode 100644
index 000000000..933234bd7
--- /dev/null
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.addon;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Instance;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.kie.kogito.Application;
+import org.kie.kogito.index.api.KogitoRuntimeClient;
+import org.kie.kogito.index.model.ProcessDefinition;
+import org.kie.kogito.index.service.DataIndexServiceException;
+import org.kie.kogito.index.storage.DataIndexStorageService;
+import org.kie.kogito.process.Process;
+import org.kie.kogito.process.Processes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.quarkus.runtime.StartupEvent;
+
+import static java.lang.String.format;
+
+@ApplicationScoped
+public class ProcessDefinitionRegister {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ProcessDefinitionRegister.class);
+
+ @ConfigProperty(name = "kogito.service.url")
+ Optional<String> kogitoServiceUrl;
+
+ void startup(@Observes StartupEvent event, Instance<Processes> processesInstance, Application app, DataIndexStorageService storage, KogitoRuntimeClient client) {
+ if (processesInstance.isResolvable()) {
+ Processes processes = processesInstance.get();
+ processes.processIds().stream()
+ .map(processes::processById)
+ .map(mapProcessDefinition(app.config().addons().availableAddons(), kogitoServiceUrl.orElse(null), client))
+ .forEach(process -> {
+ LOGGER.debug("Registering process definition with id: {}", process.getId());
+ storage.getProcessDefinitionsCache().put(process.getKey(), process);
+ });
+ } else {
+ LOGGER.info("No process definitions to register.");
+ }
+ }
+
+ private Function<Process<?>, ProcessDefinition> mapProcessDefinition(Set<String> addons, String endpoint, KogitoRuntimeClient client) {
+ return p -> {
+ ProcessDefinition pd = new ProcessDefinition();
+ pd.setId(p.id());
+ pd.setName(p.name());
+ pd.setVersion(p.version());
+ pd.setType(pd.getType());
+ pd.setAddons(addons);
+ // See ProcessInstanceEventBatch.buildSource
+ pd.setEndpoint(endpoint + "/" + (p.id().contains(".") ? p.id().substring(p.id().lastIndexOf('.') + 1) : p.id()));
+ try {
+ String content = client.getProcessDefinitionSourceFileContent(null, p.id()).get();
+ pd.setSource(content);
+ } catch (InterruptedException e) {
+ LOGGER.warn("Interrupted thread while registering process definition with id: {}", p.id(), e);
+ Thread.currentThread().interrupt();
+ } catch (Exception e) {
+ throw new DataIndexServiceException(format("Failed to register process definition with id: %s", p.id()), e);
+ }
+ try {
+ pd.setNodes(client.getProcessDefinitionNodes(null, p.id()).get());
+ } catch (InterruptedException e) {
+ LOGGER.warn("Interrupted thread while registering process definition with id: {}", p.id(), e);
+ Thread.currentThread().interrupt();
+ } catch (Exception e) {
+ throw new DataIndexServiceException(format("Failed to register process definition with id: %s", p.id()), e);
+ }
+ return pd;
+ };
+ }
+
+}
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
index 4ac132c3d..c1b65512d 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
@@ -27,9 +27,9 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.context.ManagedExecutor;
import org.kie.kogito.Application;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
index e1c56069a..6e08e93c6 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.index.addon.api;
import java.nio.Buffer;
import java.util.Optional;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
index 33b10f452..e885cf497 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.addon.graphql;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.index.graphql.AbstractGraphQLSchemaManager;
import org.kie.kogito.index.model.ProcessInstanceState;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
index 29ab0a1d8..7aba3a8b5 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.addon.vertx;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
index d8db183fe..1a7d9726d 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
@@ -20,9 +20,9 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
index 1830a5968..d9b29011c 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
index 2a13a1a79..f571e5df7 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
@@ -21,7 +21,7 @@ package org.kie.kogito.explainability.api;
import java.util.Collection;
import java.util.Objects;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
index 9b19c3364..613b8c063 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
index c35367153..dc0bf86b6 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
@@ -21,8 +21,8 @@ package org.kie.kogito.explainability.api;
import java.util.Collection;
import java.util.Objects;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
index 38580f144..09351fff3 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.Objects;
import java.util.UUID;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
index 02f18fc55..633e06dd6 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
@@ -21,8 +21,8 @@ package org.kie.kogito.explainability.api;
import java.util.Collection;
import java.util.Objects;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
index af066bcd4..918827b88 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
index 3727bdf6f..3353ba1dc 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java b/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
index da33c98eb..37055f0a4 100644
--- a/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
+++ b/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
@@ -25,8 +25,9 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import mutiny.zero.flow.adapters.AdaptersToReactiveStreams;
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.eclipse.microprofile.reactive.messaging.Message;
@@ -133,6 +134,6 @@ public class ExplainabilityMessagingHandler {
@Outgoing("trusty-explainability-result")
public Publisher<String> getEventPublisher() {
- return eventSubject.toHotStream();
+ return AdaptersToReactiveStreams.publisher(eventSubject.toHotStream());
}
}
diff --git a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
index 2874f5f7c..50037afdf 100644
--- a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
+++ b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
@@ -24,7 +24,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
diff --git a/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java b/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
index 67b36a591..06440daca 100644
--- a/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
+++ b/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
@@ -20,14 +20,14 @@ package org.kie.kogito.explainability.rest;
import java.util.concurrent.CompletionStage;
-import javax.inject.Inject;
-import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
index aadffa940..084a130f3 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.explainability.local.LocalExplainer;
import org.kie.kogito.explainability.model.Prediction;
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
index 958dcc404..cd9daa560 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.rest;
import java.util.Collection;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.explainability.PredictionProviderFactory;
import org.kie.kogito.explainability.api.HasNameValue;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
index f5b9f46e7..1d62d43a9 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
@@ -21,8 +21,8 @@ package org.kie.kogito.explainability;
import java.util.concurrent.CompletionStage;
import java.util.function.Consumer;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.BaseExplainabilityRequest;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
index 76adbc616..ee20db64c 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
@@ -20,8 +20,8 @@ package org.kie.kogito.explainability;
import java.util.Collection;
-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 org.eclipse.microprofile.context.ThreadContext;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
index dd7070d27..e9627760d 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.explainability.handlers;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.context.ManagedExecutor;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
index dc5ef5687..6ce9e2770 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
@@ -29,8 +29,8 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.ConversionUtils;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
index 995ce31f3..a735a2ac6 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
@@ -20,9 +20,9 @@ package org.kie.kogito.explainability.handlers;
import java.security.SecureRandom;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.local.lime.LimeConfig;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
index bab144581..927280ebe 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
@@ -24,8 +24,8 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.PredictionProviderFactory;
import org.kie.kogito.explainability.api.BaseExplainabilityRequest;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
index 0653ceda2..b184cfcce 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
@@ -22,10 +22,10 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.BaseExplainabilityRequest;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
index 32fa35a3b..b75f6fb54 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
index a1ae055fe..a45934d83 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
index c0b70cffb..b07248fe4 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.drools.io.InputStreamResource;
import org.jbpm.bpmn2.xml.BPMNDISemanticModule;
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
index 5022f4903..00985fd63 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
@@ -18,13 +18,13 @@
*/
package org.kie.kogito.jitexecutor.bpmn.api;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.kie.kogito.jitexecutor.bpmn.JITBPMNService;
import org.kie.kogito.jitexecutor.bpmn.responses.JITBPMNValidationResult;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
index ec8b9bde9..44684aa50 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.jitexecutor.dmn;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
index b2230ecd4..9b305a37a 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.dmn.api.core.DMNModel;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
index b50ad939e..ef709e8a3 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
@@ -25,12 +25,12 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.kie.api.io.Resource;
import org.kie.dmn.api.core.DMNMessage;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
index 6ff12594c..d811adf50 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
@@ -22,13 +22,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.kie.dmn.core.internal.utils.MarshallingStubUtils;
import org.kie.kogito.jitexecutor.dmn.JITDMNService;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
index cec99ab0e..8d673f674 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
@@ -22,12 +22,12 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.openapi.OASFactory;
import org.eclipse.microprofile.openapi.models.OpenAPI;
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
index cdff7c265..8ecdba586 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.job.http.recipient.test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
index ec1c1ffdb..b0f1e420e 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
@@ -84,7 +84,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <artifactId>quarkus-extension-maven-plugin</artifactId>
<version>${version.io.quarkus}</version>
<executions>
<execution>
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
index d174f283c..547db16b5 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
@@ -18,10 +18,10 @@
*/
package org.kie.kogito.job.http.recipient;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.job.recipient.common.http.HTTPRequest;
import org.kie.kogito.job.recipient.common.http.HTTPRequestExecutor;
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
index 07a7aae78..50107127c 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
@@ -21,7 +21,7 @@ package org.kie.kogito.job.http.recipient;
import java.net.MalformedURLException;
import java.net.URL;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.internal.utils.ConversionUtils;
diff --git a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
index 4761d0248..ffe6dc7a0 100644
--- a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
+++ b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.kie.kogito.job.recipient.common.http.converters.HttpConverters;
import org.kie.kogito.jobs.api.URIBuilder;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
index 1a5251c2a..c82c91daa 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
@@ -90,7 +90,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <artifactId>quarkus-extension-maven-plugin</artifactId>
<version>${version.io.quarkus}</version>
<executions>
<execution>
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
index fb3116828..505ebbee3 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
@@ -21,10 +21,10 @@ package org.kie.kogito.job.sink.recipient;
import java.time.OffsetDateTime;
import java.util.UUID;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.job.recipient.common.http.HTTPRequest;
import org.kie.kogito.job.recipient.common.http.HTTPRequestExecutor;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
index 5826feb9d..76d96ce49 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
@@ -22,7 +22,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.internal.utils.ConversionUtils;
diff --git a/jobs-service/jobs-service-common/pom.xml b/jobs-service/jobs-service-common/pom.xml
index defe64921..0bbd7f8d2 100644
--- a/jobs-service/jobs-service-common/pom.xml
+++ b/jobs-service/jobs-service-common/pom.xml
@@ -93,6 +93,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-openapi</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny-zero-flow-adapters</artifactId>
+ </dependency>
<!-- Logging -->
<dependency>
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 207335f46..0eddc443f 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,9 +18,9 @@
*/
package org.kie.kogito.jobs.service.executor;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.kie.kogito.jobs.service.model.JobDetails;
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 b334e424b..b42b5376f 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,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.json;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
import org.kie.kogito.jobs.service.api.serlialization.SerializationUtils;
import org.slf4j.Logger;
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 37bda9e54..09203d2ad 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,8 +20,8 @@ package org.kie.kogito.jobs.service.management;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import org.eclipse.microprofile.config.inject.ConfigProperty;
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 80101b912..a756746f6 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,11 +25,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+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;
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 0c0de570d..c07792b0e 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,8 +20,8 @@ package org.kie.kogito.jobs.service.management;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java
index 5739f2544..07734ccbd 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java
@@ -32,6 +32,8 @@ import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
import io.smallrye.mutiny.Uni;
+import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher;
+
public abstract class ReactiveMessagingEventConsumer {
private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveMessagingEventConsumer.class);
@@ -77,7 +79,7 @@ public abstract class ReactiveMessagingEventConsumer {
return Uni.createFrom().completionStage(jobRepository.get(job.getId()))
.flatMap(existingJob -> {
if (existingJob == null || existingJob.getStatus() == JobStatus.SCHEDULED) {
- return Uni.createFrom().publisher(scheduler.schedule(job));
+ return Uni.createFrom().publisher(publisher(scheduler.schedule(job)));
} else {
LOGGER.info("A Job in status: {} already exists for the job id: {}, no processing will be done fot the event: {}.",
existingJob.getStatus(),
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 3d2da793c..d7c36bbd4 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,7 +21,7 @@ package org.kie.kogito.jobs.service.repository.impl;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.jobs.service.model.JobServiceManagementInfo;
import org.kie.kogito.jobs.service.repository.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 ee7a88b67..bf349c863 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,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.repository.impl;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
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 4cbb0ad1b..ddbbe7e80 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,8 +28,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+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;
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 3f1c2b9df..65e80f4b3 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,8 +24,8 @@ import java.util.Date;
import java.util.Map;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+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;
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 12812f945..c45bd7b10 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,7 +21,7 @@ package org.kie.kogito.jobs.service.repository.marshaller;
import java.util.Objects;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.jobs.service.model.Recipient;
import org.kie.kogito.jobs.service.model.RecipientInstance;
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 2359a7b2b..fecfa1f92 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,7 +22,7 @@ import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.timer.Trigger;
import org.kie.kogito.timer.impl.IntervalTrigger;
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 48b9bb9e5..644a0d8e0 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,13 +21,13 @@ package org.kie.kogito.jobs.service.resource;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+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;
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 9bb98f0a3..2bf124b82 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,18 +18,18 @@
*/
package org.kie.kogito.jobs.service.resource;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.PATCH;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+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;
@@ -46,6 +46,8 @@ import org.slf4j.LoggerFactory;
import io.smallrye.mutiny.Uni;
+import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher;
+
@ApplicationScoped
@Path(RestApiConstants.JOBS_PATH)
public class JobResource {
@@ -68,7 +70,7 @@ public class JobResource {
public Uni<ScheduledJob> create(Job job) {
LOGGER.debug("REST create {}", job);
JobDetails jobDetails = jobDetailsValidator.validateToCreate(ScheduledJobAdapter.to(ScheduledJob.builder().job(job).build()));
- return Uni.createFrom().publisher(scheduler.schedule(jobDetails))
+ return Uni.createFrom().publisher(publisher(scheduler.schedule(jobDetails)))
.onItem().ifNull().failWith(new RuntimeException("Failed to schedule job " + job))
.onItem().transform(ScheduledJobAdapter::of);
}
@@ -82,7 +84,7 @@ public class JobResource {
LOGGER.debug("REST patch update {}", job);
//validating allowed patch attributes
JobDetails jobToBeMerged = jobDetailsValidator.validateToMerge(ScheduledJobAdapter.to(ScheduledJobBuilder.from(job)));
- return Uni.createFrom().publisher(scheduler.reschedule(id, jobToBeMerged.getTrigger()).buildRs())
+ return Uni.createFrom().publisher(publisher(scheduler.reschedule(id, jobToBeMerged.getTrigger()).buildRs()))
.onItem().ifNull().failWith(new NotFoundException("Failed to reschedule job " + job))
.onItem().transform(ScheduledJobAdapter::of);
}
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 0da279515..4a4cfe3af 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,11 +18,11 @@
*/
package org.kie.kogito.jobs.service.resource;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+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;
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 cd7557aa7..73476dfa3 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,9 +18,9 @@
*/
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+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;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
index 55cd6c55e..c9af24191 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
@Provider
public class DefaultExceptionMapper extends BaseExceptionMapper<Exception> {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
index 0a7207d1a..d4af83f2f 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
@Provider
public class IllegalArgumentExceptionMapper extends BaseExceptionMapper<IllegalArgumentException> {
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 d92d13528..1de5f6335 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,7 +18,7 @@
*/
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
import org.kie.kogito.jobs.service.exception.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 1df46f4d3..b2e050e27 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,7 +18,7 @@
*/
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
import org.kie.kogito.jobs.service.exception.JobValidationException;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
index dc084bc41..176f5a955 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ext.Provider;
@Provider
public class NotFoundExceptionMapper extends BaseExceptionMapper<NotFoundException> {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
index 26cf01e54..d6c5382f8 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
public class WebApplicationExceptionMapper extends BaseExceptionMapper<WebApplicationException> {
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 4a17ec57d..a55727bed 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,17 +18,17 @@
*/
package org.kie.kogito.jobs.service.resource.v2;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+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;
@@ -43,6 +43,8 @@ import org.slf4j.LoggerFactory;
import io.smallrye.mutiny.Uni;
+import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher;
+
@ApplicationScoped
@Path(RestApiConstants.V2 + RestApiConstants.JOBS_PATH)
public class JobResourceV2 {
@@ -66,7 +68,7 @@ public class JobResourceV2 {
LOGGER.debug("REST create {}", job);
jobValidator.validateToCreate(job);
JobDetails jobDetails = JobDetailsAdapter.from(job);
- return Uni.createFrom().publisher(scheduler.schedule(jobDetails))
+ return Uni.createFrom().publisher(publisher(scheduler.schedule(jobDetails)))
.onItem().ifNull().failWith(new RuntimeException("Failed to schedule job " + job))
.onItem().transform(JobDetailsAdapter::toJob);
}
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
index c18029793..aa2b39a82 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
@@ -49,6 +49,8 @@ import org.slf4j.LoggerFactory;
import io.smallrye.mutiny.Uni;
+import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher;
+
/**
* Base reactive Job Scheduler that performs the fundamental operations and let to the concrete classes to
* implement the scheduling actions.
@@ -315,7 +317,7 @@ public abstract class BaseTimerJobScheduler implements ReactiveJobScheduler {
return Uni.createFrom().completionStage(futureJob)
.onItem().invoke(job -> LOGGER.debug("Cancel Job Scheduling {}", job))
.chain(scheduledJob -> Optional.ofNullable(scheduledJob.getScheduledId())
- .map(id -> Uni.createFrom().publisher(this.doCancel(scheduledJob))
+ .map(id -> Uni.createFrom().publisher(publisher(this.doCancel(scheduledJob)))
.onItem().transform(b -> scheduledJob))
.orElse(Uni.createFrom().item(scheduledJob)))
//final state, removing the job
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 3649eafcd..fa80ae3cc 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,9 +23,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
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 8c0828e1d..06e396e2c 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,8 +22,8 @@ import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletionStage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
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 503e08940..9c81c786f 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,7 +24,7 @@ import java.time.chrono.ChronoZonedDateTime;
import java.util.Collection;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.jobs.service.model.ManageableJobHandle;
import org.kie.kogito.jobs.service.utils.DateUtil;
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 793744677..35d392aab 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,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.stream;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
import org.eclipse.microprofile.reactive.messaging.Channel;
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 c3fae95e8..d4165a1f5 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,8 +20,8 @@ package org.kie.kogito.jobs.service.validation;
import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.kie.kogito.jobs.service.exception.JobValidationException;
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 9ce3080cc..33a955645 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,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.validation;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.kie.kogito.jobs.service.api.Job;
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 8f752c617..0196fea03 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,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.validation;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+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;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
index 2c145433e..8a0d30773 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
@@ -23,9 +23,9 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
@ApplicationScoped
public class RecipientValidatorProvider {
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 9b6648d05..58a89f89e 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,8 +23,8 @@ import java.util.Arrays;
import java.util.function.Function;
import java.util.stream.Stream;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
index 4fe11b8a5..ebfa5f531 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
@@ -23,16 +23,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-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 javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+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;
+import jakarta.ws.rs.core.Response;
/**
* Helper resource for emulating the callback endpoint of a Job created by using the Job service events API and to have
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 2cb4b7f72..aadf605f1 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,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Channel;
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 d91a71402..c0c26dd16 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,7 +20,7 @@ package org.kie.kogito.jobs.service.resource;
import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.BeforeAll;
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 58adb4860..9daf41617 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,7 +20,7 @@ package org.kie.kogito.jobs.service.resource;
import java.io.IOException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
index 21c8e60d2..daa9edf7b 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
@@ -40,10 +40,10 @@ import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath;
import static com.github.tomakehurst.wiremock.client.WireMock.post;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
+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;
/**
* This resource emulates external resources that can be used in different jobs service tests, for example to check
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 914517a3b..3103f13fd 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,7 +20,7 @@ package org.kie.kogito.jobs.service.resource.v2.http.recipient;
import java.time.OffsetDateTime;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -38,10 +38,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.github.tomakehurst.wiremock.WireMockServer;
import static java.util.concurrent.TimeUnit.MINUTES;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
+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 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 bc3de5914..e58a5b5c8 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,7 +21,7 @@ package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
import java.net.URI;
import java.time.OffsetDateTime;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java
index 08185b4ee..62ebd9b2c 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java
@@ -51,6 +51,7 @@ import org.reactivestreams.Publisher;
import io.smallrye.mutiny.Multi;
import io.smallrye.mutiny.Uni;
+import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.kie.kogito.jobs.service.model.JobStatus.CANCELED;
@@ -358,7 +359,7 @@ public abstract class BaseTimerJobSchedulerTest {
private void subscribeOn(Publisher<JobDetails> schedule) {
Multi.createFrom()
- .publisher(schedule)
+ .publisher(publisher(schedule))
.subscribe()
.with(dummyCallback(), dummyCallback());
}
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java
index b6567ce0c..9c5ca3bc9 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java
@@ -45,6 +45,7 @@ import org.reactivestreams.Publisher;
import io.smallrye.mutiny.Multi;
+import static mutiny.zero.flow.adapters.AdaptersToFlow.publisher;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
@@ -79,14 +80,14 @@ class TimerDelegateJobSchedulerTest extends BaseTimerJobSchedulerTest {
@Test
void testDoSchedule() {
PublisherBuilder<ManageableJobHandle> schedule = tested.doSchedule(scheduledJob, Optional.empty());
- Multi.createFrom().publisher(schedule.buildRs()).subscribe().with(dummyCallback(), dummyCallback());
+ Multi.createFrom().publisher(publisher(schedule.buildRs())).subscribe().with(dummyCallback(), dummyCallback());
verify(timer).scheduleJob(any(DelegateJob.class), any(JobDetailsContext.class), eq(scheduledJob.getTrigger()));
}
@Test
void testDoCancel() {
Publisher<ManageableJobHandle> cancel = tested.doCancel(JobDetails.builder().of(scheduledJob).scheduledId(SCHEDULED_ID).build());
- Multi.createFrom().publisher(cancel).subscribe().with(dummyCallback(), dummyCallback());
+ Multi.createFrom().publisher(publisher(cancel)).subscribe().with(dummyCallback(), dummyCallback());
verify(timer).removeJob(any(ManageableJobHandle.class));
}
@@ -94,7 +95,7 @@ class TimerDelegateJobSchedulerTest extends BaseTimerJobSchedulerTest {
void testDoCancelNullId() {
Publisher<ManageableJobHandle> cancel =
tested.doCancel(JobDetails.builder().of(scheduledJob).scheduledId(null).build());
- Multi.createFrom().publisher(cancel).subscribe().with(dummyCallback(), dummyCallback());
+ Multi.createFrom().publisher(publisher(cancel)).subscribe().with(dummyCallback(), dummyCallback());
verify(timer, never()).removeJob(any(ManageableJobHandle.class));
}
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 a23589deb..a1424980e 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,7 +21,7 @@ package org.kie.kogito.jobs.service.validation;
import java.util.Arrays;
import java.util.stream.Stream;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.Test;
import org.kie.kogito.jobs.service.api.PayloadData;
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
index 510c6038f..0087c596a 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
@@ -21,14 +21,13 @@ package org.kie.kogito.jobs.service.repository.infinispan;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.interceptor.Interceptor;
-
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.interceptor.Interceptor;
+import jakarta.annotation.Priority;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.Readiness;
import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
index b400dfddb..7fdf4464b 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
import java.util.concurrent.CompletionStage;
import java.util.stream.Collectors;
-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 org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
index 3952c06b8..a7e86a380 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
import java.io.IOException;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.MessageMarshaller;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
index 12c168e81..aab7bf2fb 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.Path;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.Path;
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
index 3d477730a..c4e7a56b8 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.repository.infinispan;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Instance;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
index 54dd96b1d..3a339e7e6 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.infinispan;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.junit.jupiter.api.BeforeEach;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
index 82d8b7f43..7d524ed4b 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.Path;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.Path;
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
index ee59162e2..07df1fd1d 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.inmemory.postgresql;
import java.time.Duration;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInstance;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
index 5e151206c..093a5c2f1 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.messaging.http;
import java.lang.reflect.Type;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.slf4j.Logger;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
index e52c40aac..f50f13710 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging.http;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
index 6c11b0777..390381833 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
@@ -24,7 +24,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.function.UnaryOperator;
-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/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
index 4119e7568..25541fc62 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
@@ -21,9 +21,9 @@ package org.kie.kogito.jobs.service.messaging.http.stream;
import java.util.Optional;
import java.util.function.Supplier;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.HttpHeaders;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
index ceb2cbf42..4199cfbd7 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging.http.v2;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
index 61b6dee7f..8d2fde08b 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.messaging.http;
import java.net.URI;
import java.time.OffsetDateTime;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.eclipse.microprofile.reactive.messaging.Metadata;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
index 6fc2836a2..f8e365f92 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.messaging.http.stream;
import java.util.Optional;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.kie.kogito.jobs.service.stream.AbstractJobStreamsTest;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
index 232c0fb3c..538c79f53 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging.kafka;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.reactive.messaging.spi.Connector;
import org.kie.kogito.jobs.service.messaging.MessagingHandler;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
index 90f2017c7..389ba67d5 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging.kafka;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
index 1c428782f..97788d433 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
@@ -23,9 +23,9 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.slf4j.Logger;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
index 9f852778a..91df88169 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.service.messaging.kafka.stream;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
index e209fd759..91576ecf3 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging.kafka.v2;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
index fc3cfa355..5c219aaea 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
import org.kie.kogito.testcontainers.quarkus.KafkaQuarkusTestResource;
diff --git a/jobs-service/jobs-service-mongodb/pom.xml b/jobs-service/jobs-service-mongodb/pom.xml
index ebe22617f..87949efc5 100644
--- a/jobs-service/jobs-service-mongodb/pom.xml
+++ b/jobs-service/jobs-service-mongodb/pom.xml
@@ -34,6 +34,10 @@
<description>Jobs Service (Timers and Async Jobs) with MongoDB</description>
<dependencies>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny-zero-flow-adapters</artifactId>
+ </dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>jobs-service-common</artifactId>
diff --git a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
index 3e18c05b7..3140f6cb5 100644
--- a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
+++ b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
@@ -21,9 +21,9 @@ package org.kie.kogito.jobs.service.repository.mongodb;
import java.time.ZonedDateTime;
import java.util.concurrent.CompletionStage;
-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 org.bson.Document;
import org.bson.json.JsonWriterSettings;
@@ -58,6 +58,7 @@ import static java.util.Arrays.stream;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.counting;
import static java.util.stream.Collectors.toList;
+import static mutiny.zero.flow.adapters.AdaptersToReactiveStreams.publisher;
import static org.bson.Document.parse;
import static org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams.fromPublisher;
@@ -144,17 +145,17 @@ public class MongoDBJobRepository extends BaseReactiveJobRepository implements R
@Override
public PublisherBuilder<JobDetails> findAll() {
- return fromPublisher(collection.find()
+ return fromPublisher(publisher(collection.find()
.map(document -> documentToJson(document))
.map(jobDetailsMarshaller::unmarshall)
.emitOn(Infrastructure.getDefaultExecutor())
.convert()
- .toPublisher());
+ .toPublisher()));
}
@Override
public PublisherBuilder<JobDetails> findByStatusBetweenDatesOrderByPriority(ZonedDateTime from, ZonedDateTime to, JobStatus... status) {
- return fromPublisher(
+ return fromPublisher(publisher(
collection.find(
and(
in(STATUS_COLUMN, stream(status).map(Enum::name).collect(toList())),
@@ -165,7 +166,7 @@ public class MongoDBJobRepository extends BaseReactiveJobRepository implements R
.map(jobDetailsMarshaller::unmarshall)
.emitOn(Infrastructure.getDefaultExecutor())
.convert()
- .toPublisher());
+ .toPublisher()));
}
static JsonObject documentToJson(Document document) {
diff --git a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
index 869d921d5..537a7fa28 100644
--- a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
+++ b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.repository.mongodb.marshaller;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.jobs.service.model.JobDetails;
import org.kie.kogito.jobs.service.repository.marshaller.JobDetailsMarshaller;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
index 0907fa372..3cf723ce4 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.Path;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.Path;
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java
index bd92b95a5..216300e7a 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Flow;
import org.bson.Document;
import org.bson.conversions.Bson;
@@ -39,7 +40,6 @@ import org.kie.kogito.jobs.service.model.RecipientInstance;
import org.kie.kogito.jobs.service.repository.marshaller.JobDetailsMarshaller;
import org.kie.kogito.timer.impl.PointInTimeTrigger;
import org.mockito.ArgumentCaptor;
-import org.reactivestreams.Publisher;
import com.mongodb.client.model.FindOneAndReplaceOptions;
import com.mongodb.client.model.ReturnDocument;
@@ -127,7 +127,7 @@ class MongoDBJobRepositoryExecutionTest {
MultiConvert convertMulti = mock(MultiConvert.class);
when(multi.emitOn(any())).thenReturn(multi);
when(multi.convert()).thenReturn(convertMulti);
- Publisher publisher = mock(Publisher.class);
+ Flow.Publisher publisher = mock(Flow.Publisher.class);
when(convertMulti.toPublisher()).thenReturn(publisher);
completableFuture = mock(CompletableFuture.class);
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
index d084da7df..b5f8cdbf1 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.mongodb;
import java.time.Duration;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/jobs-service/jobs-service-postgresql-common/pom.xml b/jobs-service/jobs-service-postgresql-common/pom.xml
index 4f7550a54..448c807c4 100644
--- a/jobs-service/jobs-service-postgresql-common/pom.xml
+++ b/jobs-service/jobs-service-postgresql-common/pom.xml
@@ -34,6 +34,10 @@
<description>Jobs Service (Timers and Async Jobs) PostgreSQL Common</description>
<dependencies>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny-zero-flow-adapters</artifactId>
+ </dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>jobs-service-common</artifactId>
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
index 9a1fc1794..5bdd8b495 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
+++ b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
@@ -26,8 +26,8 @@ import java.util.concurrent.CompletionStage;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+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;
@@ -50,6 +50,7 @@ import io.vertx.mutiny.sqlclient.RowSet;
import io.vertx.mutiny.sqlclient.Tuple;
import static java.util.stream.Collectors.toList;
+import static mutiny.zero.flow.adapters.AdaptersToReactiveStreams.publisher;
import static org.kie.kogito.jobs.service.utils.DateUtil.DEFAULT_ZONE;
@ApplicationScoped
@@ -140,18 +141,18 @@ public class PostgreSqlJobRepository extends BaseReactiveJobRepository implement
public PublisherBuilder<JobDetails> findByStatus(JobStatus... status) {
String statusQuery = createStatusQuery(status);
String query = " WHERE " + statusQuery;
- return ReactiveStreams.fromPublisher(
+ return ReactiveStreams.fromPublisher(publisher(
client.preparedQuery("SELECT " + JOB_DETAILS_COLUMNS + " FROM " + JOB_DETAILS_TABLE + query + " ORDER BY priority DESC LIMIT $1").execute(Tuple.of(MAX_ITEMS_QUERY))
.onItem().transformToMulti(rowSet -> Multi.createFrom().iterable(rowSet))
- .onItem().transform(this::from));
+ .onItem().transform(this::from)));
}
@Override
public PublisherBuilder<JobDetails> findAll() {
- return ReactiveStreams.fromPublisher(
+ return ReactiveStreams.fromPublisher(publisher(
client.preparedQuery("SELECT " + JOB_DETAILS_COLUMNS + " FROM " + JOB_DETAILS_TABLE + " LIMIT $1").execute(Tuple.of(MAX_ITEMS_QUERY))
.onItem().transformToMulti(rowSet -> Multi.createFrom().iterable(rowSet))
- .onItem().transform(this::from));
+ .onItem().transform(this::from)));
}
@Override
@@ -160,11 +161,11 @@ public class PostgreSqlJobRepository extends BaseReactiveJobRepository implement
String timeQuery = createTimeQuery("$2", "$3");
String query = " WHERE " + statusQuery + " AND " + timeQuery;
- return ReactiveStreams.fromPublisher(
+ return ReactiveStreams.fromPublisher(publisher(
client.preparedQuery("SELECT " + JOB_DETAILS_COLUMNS + " FROM " + JOB_DETAILS_TABLE + query + " ORDER BY priority DESC LIMIT $1")
.execute(Tuple.of(MAX_ITEMS_QUERY, from.toOffsetDateTime(), to.toOffsetDateTime()))
.onItem().transformToMulti(rowSet -> Multi.createFrom().iterable(rowSet))
- .onItem().transform(this::from));
+ .onItem().transform(this::from)));
}
static String createStatusQuery(JobStatus... status) {
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
index 1f617472a..951c20e94 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
+++ b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
@@ -23,8 +23,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.jobs.service.model.JobServiceManagementInfo;
import org.kie.kogito.jobs.service.repository.JobServiceManagementRepository;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
index 6f2d6244b..d5ce76aa0 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.postgresql;
import java.time.Duration;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.jobs.service.repository.ReactiveJobRepository;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
index 569f92ee9..8c9d5c771 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.repository.postgresql;
import java.time.OffsetDateTime;
import java.util.concurrent.atomic.AtomicReference;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
index dbc11be22..f2bea4ea9 100644
--- a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
+++ b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.Path;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.Path;
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
index 9901ca4ff..c614353b8 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.addons.quarkus.jobs.service.embedded.stream;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
index c098cd2d8..72d07bfcb 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.stream.Stream;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.Test;
import org.kie.kogito.event.EventPublisher;
diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml
index 60a28dbe4..d773ad06b 100644
--- a/kogito-apps-build-parent/pom.xml
+++ b/kogito-apps-build-parent/pom.xml
@@ -65,18 +65,21 @@
<container.image.integration-tests-trusty-service-quarkus>org.kie.kogito/integration-tests-trusty-service-quarkus:${project.version}</container.image.integration-tests-trusty-service-quarkus>
<!-- OptaPlanner version -->
- <version.org.optaplanner>8.44.0.Final</version.org.optaplanner>
+ <version.org.optaplanner>9.44.0.Final</version.org.optaplanner>
- <version.com.vladmihalcea.hibernate-types-55>2.12.1</version.com.vladmihalcea.hibernate-types-55>
+ <version.org.hibernate>6.2.13.Final</version.org.hibernate>
<version.org.apache.opennlp>1.9.2</version.org.apache.opennlp>
<version.org.apache.commons.csv>1.8</version.org.apache.commons.csv>
<version.org.jredisearch>2.0.0</version.org.jredisearch>
- <version.org.mapstruct>1.4.2.Final</version.org.mapstruct>
+ <version.org.mapstruct>1.5.5.Final</version.org.mapstruct>
<version.org.skyscreamer>1.5.0</version.org.skyscreamer>
<version.com.graphql-java-extended-scalars>19.0</version.com.graphql-java-extended-scalars>
<!-- Explainability Toolkit version -->
<version.explainability-core>1.22.1.Final</version.explainability-core>
+
+ <!-- Mutiny Zero Flow Adapters -->
+ <version.io.smallrye.reactive.mutiny-zero>1.0.0</version.io.smallrye.reactive.mutiny-zero>
</properties>
<build>
@@ -177,6 +180,11 @@
<artifactId>mapstruct</artifactId>
<version>${version.org.mapstruct}</version>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny-zero-flow-adapters</artifactId>
+ <version>${version.io.smallrye.reactive.mutiny-zero}</version>
+ </dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
@@ -184,9 +192,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.vladmihalcea</groupId>
- <artifactId>hibernate-types-55</artifactId>
- <version>${version.com.vladmihalcea.hibernate-types-55}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-ant</artifactId>
+ <version>${version.org.hibernate}</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java
index 93b58135d..effce8f5a 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java
@@ -43,7 +43,7 @@ import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder;
public class DevConsoleProcessor {
private static final String STATIC_RESOURCES_PATH = "dev-static/";
- private static final String BASE_RELATIVE_URL = "/q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui";
+ private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow-devui";
private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index";
@BuildStep(onlyIf = IsDevelopment.class)
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
index 64c87c399..db9be21fa 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
@@ -123,7 +123,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <artifactId>quarkus-extension-maven-plugin</artifactId>
<version>${version.io.quarkus}</version>
<executions>
<execution>
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
index 3f7398b44..b372926dc 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
@@ -18,20 +18,20 @@
*/
package org.kie.kogito.swf.tools.custom.dashboard;
-import javax.inject.Inject;
-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 javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+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;
+import jakarta.ws.rs.core.Response;
import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
@Path("/customDashboard")
public class CustomDashboardService {
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
index 9e7340b37..bc3f7d199 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.StringTokenizer;
import java.util.stream.Collectors;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.Provider;
import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
index 45de74a77..fd968f5fa 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
@@ -21,9 +21,9 @@ package org.kie.kogito.swf.tools.custom.dashboard.converter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.Provider;
import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
index e6cd0387c..73583d44d 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
@@ -43,7 +43,7 @@ import java.util.TimeZone;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
diff --git a/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java b/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
index 827b4dea1..47bff272f 100644
--- a/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
+++ b/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
@@ -18,9 +18,8 @@
*/
package org.kie.kogito.mgmt;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +30,7 @@ import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.StaticHandler;
+import jakarta.annotation.PostConstruct;
@ApplicationScoped
public class VertxRouter {
diff --git a/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java b/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
index 62f2d796b..d6a4fc4df 100644
--- a/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
+++ b/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.mgmt;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
-@NativeImageTest
+@QuarkusIntegrationTest
public class NativeStaticContentTestIT extends StaticContentIT {
// Execute the same tests but in native mode.
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
index 4d4ea17f9..6f60c7466 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.persistence.infinispan;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
import org.eclipse.microprofile.health.Readiness;
import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
index cfee4ee89..b8ee3ce36 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
@@ -20,9 +20,9 @@ package org.kie.kogito.persistence.infinispan.cache;
import java.util.Optional;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java
index 29292da9a..1beb34b0f 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java
@@ -78,7 +78,7 @@ public class InfinispanStorage<K, V> implements Storage<K, V> {
UnicastProcessor<V> processor = UnicastProcessor.create();
CacheObjectCreatedListener<K, V> listener = new CacheObjectCreatedListener<>(delegate, v -> processor.onNext(v));
return processor
- .onSubscribe().invoke(s -> delegate.addClientListener(listener))
+ .onSubscription().invoke(s -> delegate.addClientListener(listener))
.onTermination().invoke(() -> delegate.removeClientListener(listener));
}
@@ -88,7 +88,7 @@ public class InfinispanStorage<K, V> implements Storage<K, V> {
UnicastProcessor<V> processor = UnicastProcessor.create();
CacheObjectUpdatedListener<K, V> listener = new CacheObjectUpdatedListener<>(delegate, v -> processor.onNext(v));
return processor
- .onSubscribe().invoke(s -> delegate.addClientListener(listener))
+ .onSubscription().invoke(s -> delegate.addClientListener(listener))
.onTermination().invoke(() -> delegate.removeClientListener(listener));
}
@@ -98,7 +98,7 @@ public class InfinispanStorage<K, V> implements Storage<K, V> {
UnicastProcessor<K> processor = UnicastProcessor.create();
CacheObjectRemovedListener<K> listener = new CacheObjectRemovedListener<>(v -> processor.onNext(v));
return processor
- .onSubscribe().invoke(s -> delegate.addClientListener(listener))
+ .onSubscription().invoke(s -> delegate.addClientListener(listener))
.onTermination().invoke(() -> delegate.removeClientListener(listener));
}
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
index ed1101d20..357694e2e 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
@@ -20,11 +20,11 @@ package org.kie.kogito.persistence.infinispan.cache;
import java.util.Optional;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.infinispan.client.hotrod.DataFormat;
import org.infinispan.client.hotrod.RemoteCache;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
index a18994b5c..784187ccf 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
@@ -21,8 +21,8 @@ package org.kie.kogito.persistence.infinispan.cache;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.infinispan.commons.dataconversion.MediaType;
import org.infinispan.commons.io.ByteBuffer;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
index 8e42cfda2..4f2d6768e 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.persistence.infinispan.cache;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
index 4eee6b1fe..8b79bba80 100644
--- a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
+++ b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.infinispan.client.hotrod.DefaultTemplate;
import org.infinispan.client.hotrod.RemoteCache;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
index 4a918da36..6e0af17de 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.persistence.mongodb.client;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.eclipse.microprofile.config.ConfigProvider;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
index eb379b3bd..173eb3f5f 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
@@ -27,11 +27,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+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.bson.Document;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
index d68648d11..248ef1863 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
@@ -20,7 +20,7 @@ package org.kie.kogito.persistence.mongodb.index;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.api.schema.SchemaAcceptor;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
index d51d0aba5..00297442b 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.persistence.mongodb.storage;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
index 737e0e587..2594c363f 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.mongodb.client;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
index 4a6021ba5..c9fab141a 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
@@ -29,7 +29,7 @@ import java.util.UUID;
import java.util.stream.IntStream;
import java.util.stream.StreamSupport;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
index 98e9f2984..0279ad54b 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.mongodb.mock;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.mongodb.model.MongoEntityMapper;
import org.kie.kogito.persistence.mongodb.storage.MongoModelService;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
index 40a2dc61d..f5b5848e5 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.mongodb.mock;
import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import org.kie.kogito.persistence.mongodb.index.ProcessIndexEvent;
import org.mockito.Mockito;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
index 19289b04d..7c42b22d1 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
@@ -20,7 +20,7 @@ package org.kie.kogito.persistence.mongodb.query;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
index 92a69676b..15a20d147 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.mongodb.storage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
index e3bad6d69..c21664241 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.mongodb.storage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
index 58e39d4d9..4dcb7f437 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.mongodb.storage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
index 36ffc7325..3191c32ce 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-oracle/pom.xml b/persistence-commons/persistence-commons-oracle/pom.xml
index ab6db2dbd..8e011f3c7 100644
--- a/persistence-commons/persistence-commons-oracle/pom.xml
+++ b/persistence-commons/persistence-commons-oracle/pom.xml
@@ -46,8 +46,8 @@
<artifactId>quarkus-jdbc-oracle</artifactId>
</dependency>
<dependency>
- <groupId>com.vladmihalcea</groupId>
- <artifactId>hibernate-types-55</artifactId>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-ant</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
index 507ad8acd..bc0c0e758 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
@@ -25,17 +25,19 @@ import java.util.Objects;
import java.util.stream.Collectors;
import org.hibernate.query.NativeQuery;
+import org.hibernate.type.CustomType;
+import org.hibernate.type.spi.TypeConfiguration;
import org.kie.kogito.persistence.api.query.AttributeFilter;
import org.kie.kogito.persistence.api.query.AttributeSort;
import org.kie.kogito.persistence.api.query.FilterCondition;
import org.kie.kogito.persistence.api.query.Query;
+import org.kie.kogito.persistence.oracle.hibernate.JsonBinaryType;
import org.kie.kogito.persistence.oracle.model.CacheEntityRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vladmihalcea.hibernate.type.json.JsonBlobType;
import static java.lang.String.format;
import static java.util.stream.Collectors.joining;
@@ -137,10 +139,10 @@ public class OracleQuery<T> implements Query<T> {
}
LOGGER.debug("Executing Oracle query: {}", queryString);
- javax.persistence.Query query = repository.getEntityManager()
+ jakarta.persistence.Query query = repository.getEntityManager()
.createNativeQuery(queryString.toString())
.unwrap(NativeQuery.class)
- .addScalar("json_value", new JsonBlobType(type));
+ .addScalar("json_value", new CustomType<>(new JsonBinaryType(), new TypeConfiguration()));
if (limit != null) {
query.setMaxResults(limit);
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
index e577e7e40..853cdb29c 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.persistence.oracle;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java
index bee97ed84..667e799f6 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java
@@ -18,91 +18,83 @@
*/
package org.kie.kogito.persistence.oracle.hibernate;
+import java.io.ByteArrayInputStream;
import java.io.Serializable;
+import java.sql.Blob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Types;
import java.util.Objects;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.type.SqlTypes;
import org.hibernate.usertype.UserType;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import static java.lang.String.format;
-public class JsonBinaryType implements UserType {
+public class JsonBinaryType implements UserType<JsonNode> {
private ObjectMapper mapper = new ObjectMapper();
@Override
- public int[] sqlTypes() {
- return new int[] { Types.JAVA_OBJECT };
+ public int getSqlType() {
+ return SqlTypes.BLOB;
}
@Override
- public Class returnedClass() {
+ public Class<JsonNode> returnedClass() {
return JsonNode.class;
}
@Override
- public boolean equals(Object x, Object y) throws HibernateException {
+ public boolean equals(JsonNode x, JsonNode y) throws HibernateException {
return Objects.equals(x, y);
}
@Override
- public int hashCode(Object x) throws HibernateException {
+ public int hashCode(JsonNode x) throws HibernateException {
return Objects.hashCode(x);
}
@Override
- public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner)
+ public JsonNode nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner)
throws HibernateException, SQLException {
- final String json = rs.getString(names[0]);
- if (json == null) {
+ final Blob json = rs.getBlob(position);
+ if (json.length() == 0) {
return null;
}
try {
- return mapper.readTree(json.getBytes("UTF-8"));
+ return mapper.readTree(json.getBinaryStream());
} catch (final Exception ex) {
- throw new RuntimeException("Failed to convert String to Invoice: " + ex.getMessage(), ex);
+ throw new RuntimeException("Failed to convert String to JSON: " + ex.getMessage(), ex);
}
}
@Override
- public void nullSafeSet(PreparedStatement ps, Object value, int index, SharedSessionContractImplementor session)
+ public void nullSafeSet(PreparedStatement ps, JsonNode value, int index, SharedSessionContractImplementor session)
throws HibernateException, SQLException {
if (value == null) {
- ps.setNull(index, Types.OTHER);
+ ps.setNull(index, SqlTypes.BLOB);
return;
}
- if (value instanceof ObjectNode) {
- try {
- //ps.setObject(index, value.toString(), Types.OTHER);
- ps.setObject(index, value.toString(), Types.LONGNVARCHAR);
- } catch (final Exception ex) {
- throw new RuntimeException(format("Failed to convert JSON to String: %s", ex.getMessage()), ex);
- }
- } else {
- throw new RuntimeException(format("Cannot convert type %s as JSON String", value.getClass().getCanonicalName()));
+ try {
+ ps.setBlob(index, new ByteArrayInputStream(value.toString().getBytes()));
+ } catch (final Exception ex) {
+ throw new RuntimeException(format("Failed to convert JSON to String: %s", ex.getMessage()), ex);
}
}
@Override
- public Object deepCopy(Object value) throws HibernateException {
+ public JsonNode deepCopy(JsonNode value) throws HibernateException {
if (value == null) {
return null;
}
- if (value instanceof JsonNode) {
- return ((JsonNode) value).deepCopy();
- } else {
- throw new RuntimeException(format("Cannot deep copy type %s", value.getClass().getCanonicalName()));
- }
+ return value.deepCopy();
}
@Override
@@ -111,12 +103,12 @@ public class JsonBinaryType implements UserType {
}
@Override
- public Serializable disassemble(Object value) throws HibernateException {
+ public Serializable disassemble(JsonNode value) throws HibernateException {
return this.deepCopy(value).toString();
}
@Override
- public Object assemble(Serializable cached, Object owner) throws HibernateException {
+ public JsonNode assemble(Serializable cached, Object owner) throws HibernateException {
try {
return mapper.readTree(cached.toString());
} catch (JsonProcessingException ex) {
@@ -125,7 +117,7 @@ public class JsonBinaryType implements UserType {
}
@Override
- public Object replace(Object original, Object target, Object owner) throws HibernateException {
+ public JsonNode replace(JsonNode original, JsonNode target, Object owner) throws HibernateException {
return original;
}
}
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
index 2a215f6a1..5c5660687 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
@@ -20,25 +20,24 @@ package org.kie.kogito.persistence.oracle.model;
import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Index;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
+
+import org.kie.kogito.persistence.oracle.hibernate.JsonBinaryType;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.vladmihalcea.hibernate.type.json.JsonBlobType;
@Entity
@IdClass(CacheId.class)
@Table(name = "kogito_data_cache", uniqueConstraints = @UniqueConstraint(columnNames = { "name", "key" }),
indexes = @Index(columnList = "name,key", unique = true))
-@TypeDef(name = "jsonb", typeClass = JsonBlobType.class)
public class CacheEntity {
@Id
@@ -49,7 +48,7 @@ public class CacheEntity {
@Column(nullable = false)
private String key;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
@Column(name = "json_value")
private ObjectNode value;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
index 12eba177c..73500e84a 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
index 41134f0ff..60548c5de 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
+++ b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.oracle;
import java.util.List;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
index ca2b0d05e..b821378f7 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
+++ b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
@@ -40,7 +40,7 @@ public class DDLSchemaExporter {
try (KogitoOracleSqlContainer oracle = new KogitoOracleSqlContainer()) {
oracle.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
oracle.start();
- Map<String, String> settings = new HashMap<>();
+ Map<String, Object> settings = new HashMap<>();
settings.put(Environment.URL, oracle.getJdbcUrl());
settings.put(Environment.USER, oracle.getUsername());
settings.put(Environment.PASS, oracle.getPassword());
diff --git a/persistence-commons/persistence-commons-postgresql/pom.xml b/persistence-commons/persistence-commons-postgresql/pom.xml
index 4a5ecaa1f..da5f3ca48 100644
--- a/persistence-commons/persistence-commons-postgresql/pom.xml
+++ b/persistence-commons/persistence-commons-postgresql/pom.xml
@@ -46,8 +46,8 @@
<artifactId>quarkus-jdbc-postgresql</artifactId>
</dependency>
<dependency>
- <groupId>com.vladmihalcea</groupId>
- <artifactId>hibernate-types-55</artifactId>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-ant</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
index 61605f336..ae831210e 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
@@ -24,17 +24,19 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
+import org.hibernate.type.CustomType;
+import org.hibernate.type.spi.TypeConfiguration;
import org.kie.kogito.persistence.api.query.AttributeFilter;
import org.kie.kogito.persistence.api.query.AttributeSort;
import org.kie.kogito.persistence.api.query.FilterCondition;
import org.kie.kogito.persistence.api.query.Query;
+import org.kie.kogito.persistence.postgresql.hibernate.JsonBinaryType;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vladmihalcea.hibernate.type.json.JsonNodeBinaryType;
import static java.lang.String.format;
import static java.util.stream.Collectors.joining;
@@ -136,8 +138,8 @@ public class PostgresQuery<T> implements Query<T> {
}
LOGGER.debug("Executing PostgreSQL query: {}", queryString);
- javax.persistence.Query query = repository.getEntityManager().createNativeQuery(queryString.toString());
- query.unwrap(org.hibernate.query.NativeQuery.class).addScalar("json_value", JsonNodeBinaryType.INSTANCE);
+ jakarta.persistence.Query query = repository.getEntityManager().createNativeQuery(queryString.toString());
+ query.unwrap(org.hibernate.query.NativeQuery.class).addScalar("json_value", new CustomType<>(new JsonBinaryType(), new TypeConfiguration()));
if (limit != null) {
query.setMaxResults(limit);
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
index 4d5e60407..2517cc088 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.persistence.postgresql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java
index 3f360bba2..937851b9f 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java
@@ -27,81 +27,73 @@ import java.util.Objects;
import org.hibernate.HibernateException;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.type.SqlTypes;
import org.hibernate.usertype.UserType;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import static java.lang.String.format;
-public class JsonBinaryType implements UserType {
+public class JsonBinaryType implements UserType<JsonNode> {
private ObjectMapper mapper = new ObjectMapper();
@Override
- public int[] sqlTypes() {
- return new int[] { Types.JAVA_OBJECT };
+ public int getSqlType() {
+ return SqlTypes.BLOB;
}
@Override
- public Class returnedClass() {
+ public Class<JsonNode> returnedClass() {
return JsonNode.class;
}
@Override
- public boolean equals(Object x, Object y) throws HibernateException {
+ public boolean equals(JsonNode x, JsonNode y) throws HibernateException {
return Objects.equals(x, y);
}
@Override
- public int hashCode(Object x) throws HibernateException {
+ public int hashCode(JsonNode x) throws HibernateException {
return Objects.hashCode(x);
}
@Override
- public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner)
+ public JsonNode nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner)
throws HibernateException, SQLException {
- final String json = rs.getString(names[0]);
+ final String json = rs.getString(position);
if (json == null) {
return null;
}
try {
return mapper.readTree(json.getBytes("UTF-8"));
} catch (final Exception ex) {
- throw new RuntimeException("Failed to convert String to Invoice: " + ex.getMessage(), ex);
+ throw new RuntimeException("Failed to convert String to JSON: " + ex.getMessage(), ex);
}
}
@Override
- public void nullSafeSet(PreparedStatement ps, Object value, int index, SharedSessionContractImplementor session)
+ public void nullSafeSet(PreparedStatement ps, JsonNode value, int index, SharedSessionContractImplementor session)
throws HibernateException, SQLException {
if (value == null) {
ps.setNull(index, Types.OTHER);
return;
}
- if (value instanceof ObjectNode) {
- try {
- ps.setObject(index, value.toString(), Types.OTHER);
- } catch (final Exception ex) {
- throw new RuntimeException(format("Failed to convert JSON to String: %s", ex.getMessage()), ex);
- }
- } else {
- throw new RuntimeException(format("Cannot convert type %s as JSON String", value.getClass().getCanonicalName()));
+ try {
+ ps.setObject(index, value.toString(), Types.OTHER);
+ } catch (final Exception ex) {
+ throw new RuntimeException(format("Failed to convert JSON to String: %s", ex.getMessage()), ex);
}
}
@Override
- public Object deepCopy(Object value) throws HibernateException {
+ public JsonNode deepCopy(JsonNode value) throws HibernateException {
if (value == null) {
return null;
}
- if (value instanceof JsonNode) {
- return ((JsonNode) value).deepCopy();
- } else {
- throw new RuntimeException(format("Cannot deep copy type %s", value.getClass().getCanonicalName()));
- }
+ return value.deepCopy();
}
@Override
@@ -110,12 +102,12 @@ public class JsonBinaryType implements UserType {
}
@Override
- public Serializable disassemble(Object value) throws HibernateException {
+ public Serializable disassemble(JsonNode value) throws HibernateException {
return this.deepCopy(value).toString();
}
@Override
- public Object assemble(Serializable cached, Object owner) throws HibernateException {
+ public JsonNode assemble(Serializable cached, Object owner) throws HibernateException {
try {
return mapper.readTree(cached.toString());
} catch (JsonProcessingException ex) {
@@ -124,7 +116,7 @@ public class JsonBinaryType implements UserType {
}
@Override
- public Object replace(Object original, Object target, Object owner) throws HibernateException {
+ public JsonNode replace(JsonNode original, JsonNode target, Object owner) throws HibernateException {
return original;
}
}
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
index 1887cfc0f..a77c306cf 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
@@ -20,16 +20,15 @@ package org.kie.kogito.persistence.postgresql.model;
import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Index;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
import org.kie.kogito.persistence.postgresql.hibernate.JsonBinaryType;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -38,7 +37,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
@IdClass(CacheId.class)
@Table(name = "kogito_data_cache", uniqueConstraints = @UniqueConstraint(columnNames = { "name",
"key" }), indexes = @Index(columnList = "name,key", unique = true))
-@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
public class CacheEntity {
@Id
@@ -49,7 +47,7 @@ public class CacheEntity {
@Column(nullable = false)
private String key;
- @Type(type = "jsonb")
+ @Type(JsonBinaryType.class)
@Column(name = "json_value", columnDefinition = "jsonb")
private ObjectNode value;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
index 41eb084f8..d10a53a86 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
index eb1c1cb7e..458bf5c04 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
+++ b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.postgresql;
import java.util.List;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
index 17e883c8a..b9f67b521 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
+++ b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
@@ -40,7 +40,7 @@ public class DDLSchemaExporter {
try (KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer()) {
postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
postgresql.start();
- Map<String, String> settings = new HashMap<>();
+ Map<String, Object> settings = new HashMap<>();
settings.put(Environment.URL, postgresql.getJdbcUrl());
settings.put(Environment.USER, postgresql.getUsername());
settings.put(Environment.PASS, postgresql.getPassword());
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
index 12ba72ae3..70f32eadf 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
@@ -38,9 +38,9 @@ import java.util.concurrent.Executors;
import java.util.function.Consumer;
import java.util.stream.Stream;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
import org.slf4j.Logger;
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
index 723bc2f8d..3dbd6ba87 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
@@ -23,10 +23,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.SerializationContext;
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
index 3cec63c8e..dfb044c08 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
@@ -22,10 +22,10 @@ import java.util.List;
import java.util.Map;
import java.util.function.Function;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.infinispan.protostream.descriptors.Descriptor;
import org.infinispan.protostream.descriptors.FieldDescriptor;
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
index 85177fe2e..03cdcfeaf 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.protobuf;
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.SerializationContext;
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
index 7d2ece432..ec696700d 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.protobuf;
-import javax.enterprise.event.Event;
+import jakarta.enterprise.event.Event;
import org.infinispan.protostream.FileDescriptorSource;
import org.junit.jupiter.api.BeforeEach;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
index 7ff1c43b9..edce31420 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.persistence.redis;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
index b66a40e2a..7bf6c212d 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
@@ -20,7 +20,7 @@ package org.kie.kogito.persistence.redis;
import java.net.URL;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
index a56f6f5a6..c0670c91b 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.redis.RedisClientManager;
import org.slf4j.Logger;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
index 4fb44daba..e7b433759 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.kie.kogito.persistence.reporting.database.DatabaseManager;
import org.kie.kogito.persistence.reporting.database.sqlbuilders.Context;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
index 26aaf9a90..1e36e9f8d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.kie.kogito.event.cloudevents.utils.CloudEventUtils;
import org.kie.kogito.persistence.reporting.database.sqlbuilders.ApplyMappingSqlBuilder;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
index 87fe34377..d39bbd9ef 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
index ac33ad148..6e221d6b0 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
import java.io.InputStream;
import java.util.function.Supplier;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
index 5a11b721e..f0c29b19e 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
-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 org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.postgresql.reporting.database.BasePostgresDatabaseManagerImpl;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
index 2a5a0f2d2..9bd51c5ec 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
@@ -22,15 +22,15 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityResult;
-import javax.persistence.FieldResult;
-import javax.persistence.Id;
-import javax.persistence.Query;
-import javax.persistence.SqlResultSetMapping;
-import javax.transaction.Transactional;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityResult;
+import jakarta.persistence.FieldResult;
+import jakarta.persistence.Id;
+import jakarta.persistence.Query;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.transaction.Transactional;
import org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders.PostgresApplyMappingSqlBuilder;
import org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders.PostgresContext;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
index 3771d5f51..a1be37f41 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
import java.util.List;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
index 6bd72bfa4..de26b8597 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
index 3a694a96e..e48a86f53 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
index 20066cde1..7606e345d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
index 11abb8df0..23ba0a902 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
@@ -25,7 +25,7 @@ import java.util.Objects;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
index 55e83a500..d4fddb836 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
@@ -23,9 +23,9 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.postgresql.PostgresStorageService;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
index 6d91ed383..0eb57ab35 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
index 842750fea..ea32d382a 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
@@ -20,16 +20,16 @@ package org.kie.kogito.persistence.postgresql.reporting.api;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+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.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
index 04b7b3e63..3aefb08bf 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
@@ -20,9 +20,9 @@ package org.kie.kogito.persistence.postgresql.reporting.database;
import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
import org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders.PostgresApplyMappingSqlBuilder;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
index 275847a5b..72d39d221 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityResult;
-import javax.persistence.FieldResult;
-import javax.persistence.Id;
-import javax.persistence.SqlResultSetMapping;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityResult;
+import jakarta.persistence.FieldResult;
+import jakarta.persistence.Id;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
index 68f8b41fb..d8e3ec81d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityResult;
-import javax.persistence.FieldResult;
-import javax.persistence.Id;
-import javax.persistence.SqlResultSetMapping;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityResult;
+import jakarta.persistence.FieldResult;
+import jakarta.persistence.Id;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
index 75143892e..8af6b9d1f 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityResult;
-import javax.persistence.FieldResult;
-import javax.persistence.Id;
-import javax.persistence.SqlResultSetMapping;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityResult;
+import jakarta.persistence.FieldResult;
+import jakarta.persistence.Id;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
index c41816090..be090a04b 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.postgresql.reporting.api;
import java.util.Collection;
import java.util.List;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
index c6ed8a0fa..31a64a437 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.postgresql.reporting.database;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
index d685ff1bf..7de319f57 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityResult;
-import javax.persistence.FieldResult;
-import javax.persistence.Id;
-import javax.persistence.SqlResultSetMapping;
-import javax.transaction.Transactional;
+import jakarta.inject.Inject;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityResult;
+import jakarta.persistence.FieldResult;
+import jakarta.persistence.Id;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.transaction.Transactional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
index f2b39a6f5..a5337babd 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
@@ -46,7 +46,7 @@ import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder;
public class DevConsoleProcessor {
private static final String STATIC_RESOURCES_PATH = "dev-static/";
- private static final String BASE_RELATIVE_URL = "/q/dev/org.kie.kogito.runtime-tools-quarkus-extension";
+ private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.runtime-tools-quarkus-extension";
private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index";
@SuppressWarnings("unused")
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
index e5dcfc806..adf8e901c 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
@@ -118,7 +118,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <artifactId>quarkus-extension-maven-plugin</artifactId>
<version>${version.io.quarkus}</version>
<executions>
<execution>
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
index 96a0cde27..2a3a7dc67 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
@@ -20,23 +20,23 @@ package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms;
import java.io.FileNotFoundException;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-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 javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+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;
+import jakarta.ws.rs.core.Response;
import org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model.FormContent;
import org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model.FormFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
@Path("/forms")
public class FormsService {
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
index 6a37f9014..ecd1c17c0 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.StringTokenizer;
import java.util.stream.Collectors;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.Provider;
import org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model.FormFilter;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
index 9104f319b..f63af8b16 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
@@ -21,9 +21,9 @@ package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.converter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+import jakarta.ws.rs.ext.Provider;
import org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model.FormFilter;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
index 5f1b2cf03..a3ba9df62 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
@@ -34,7 +34,7 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
diff --git a/security-commons/src/main/java/org/kie/kogito/security/UserResource.java b/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
index 149df3547..9cede72b8 100644
--- a/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
+++ b/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
@@ -21,11 +21,11 @@ package org.kie.kogito.security;
import java.util.Collections;
import java.util.Set;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.jboss.resteasy.annotations.cache.NoCache;
diff --git a/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java b/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
index a6540fbee..7635125d0 100644
--- a/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
+++ b/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
@@ -18,9 +18,8 @@
*/
package org.kie.kogito.task.console;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +30,7 @@ import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.StaticHandler;
+import jakarta.annotation.PostConstruct;
@ApplicationScoped
public class VertxRouter {
diff --git a/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java b/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
index ea181adfa..39d094906 100644
--- a/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
+++ b/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.task.console;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
-@NativeImageTest
+@QuarkusIntegrationTest
class NativeStaticContentTestIT extends StaticContentTest {
// Execute the same tests but in native mode.
diff --git a/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java b/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
index 4f7cb7e07..87b37272a 100644
--- a/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
+++ b/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
@@ -18,9 +18,8 @@
*/
package org.kie.kogito.trusty.ui;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +30,7 @@ import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.StaticHandler;
+import jakarta.annotation.PostConstruct;
@ApplicationScoped
public class VertxRouter {
diff --git a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
index b0a7e0c04..cbfdfba23 100644
--- a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
+++ b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
@@ -18,9 +18,9 @@
*/
package org.kie.kogito.trusty.ui;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
-@NativeImageTest
+@QuarkusIntegrationTest
public class NativeStaticContentTestIT extends StaticContentTest {
// Execute the same tests but in native mode.
}
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
index 7bcda7da0..24dc09230 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.requests;
import java.util.List;
import java.util.Objects;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.kie.kogito.explainability.api.CounterfactualSearchDomain;
import org.kie.kogito.explainability.api.NamedTypedValue;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
index ba283d697..a6aa0cca6 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
@@ -20,7 +20,7 @@ package org.kie.kogito.trusty.service.common.responses;
import java.util.Objects;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
index 3998ed525..82bdf6dc1 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
@@ -22,8 +22,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Objects;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/pom.xml b/trusty/trusty-service/trusty-service-common/pom.xml
index 4ee91b199..9d649fee4 100644
--- a/trusty/trusty-service/trusty-service-common/pom.xml
+++ b/trusty/trusty-service/trusty-service-common/pom.xml
@@ -85,6 +85,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-oidc</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.reactive</groupId>
+ <artifactId>mutiny-zero-flow-adapters</artifactId>
+ </dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
index 24f9f0b16..9ad7dede6 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
@@ -27,8 +27,8 @@ import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
index 84f79a4b3..a50d84b2c 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
@@ -20,12 +20,12 @@ package org.kie.kogito.trusty.service.common.api;
import java.util.Optional;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-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.MediaType;
+import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
index c31a31bb8..afbfb2071 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
@@ -29,13 +29,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import javax.inject.Inject;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
index 5e42440b6..5d7d9067b 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
@@ -22,14 +22,14 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
index d4068a31a..35725a8d2 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
import org.kie.kogito.persistence.api.Storage;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
index b0a361ae5..09fdd44f8 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.handlers;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
index 0c0c73026..3199a033e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
index ea0a1a2f9..cd2654a92 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
@@ -20,10 +20,10 @@ package org.kie.kogito.trusty.service.common.handlers;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
index 19471f3db..10d60d457 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.service.common.handlers;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
import org.kie.kogito.explainability.api.LIMEExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
index af3cc0d2c..e111fe77e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.LIMEExplainabilityResult;
import org.kie.kogito.explainability.api.SaliencyModel;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
index 7d238766e..81c5aaf71 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
@@ -21,8 +21,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
-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 org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
index c1518e8fa..ffcf871c5 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
@@ -21,8 +21,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
-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 org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
index 24ef1da19..cd0419710 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
@@ -21,8 +21,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
-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 org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
index 87bd4862f..95c4ff882 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
@@ -21,7 +21,8 @@ package org.kie.kogito.trusty.service.common.messaging.outgoing;
import java.net.URI;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
+import mutiny.zero.flow.adapters.AdaptersToReactiveStreams;
import org.eclipse.microprofile.reactive.messaging.Outgoing;
import org.kie.kogito.event.cloudevents.utils.CloudEventUtils;
@@ -55,6 +56,6 @@ public class ExplainabilityRequestProducer {
@Outgoing("trusty-explainability-request")
public Publisher<String> getEventPublisher() {
- return eventSubject.toHotStream();
+ return AdaptersToReactiveStreams.publisher(eventSubject.toHotStream());
}
}
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
index df11cf48a..0783967a5 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
@@ -26,7 +26,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
index adcb55291..607d21bcc 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.service.common;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
index bf99e6d1d..9a8797bd1 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.service.common;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.trusty.storage.api.StorageExceptionsProvider;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
index df6a168f1..16a27996a 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
@@ -27,7 +27,7 @@ import java.util.UUID;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
index d9b6e4cff..f1868a817 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
import org.apache.commons.lang3.builder.CompareToBuilder;
import org.junit.jupiter.api.Test;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
index 851ec1f1d..57848b88e 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.api;
import java.util.Collections;
import java.util.List;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
index b4a3614be..d7a4a5204 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.handlers;
import java.util.List;
import java.util.stream.Stream;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
index a3abced09..ab482651c 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.service.common.messaging.incoming;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
index 2cab3ca97..5f7c2c970 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.service.common.messaging.incoming;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.json.JSONException;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
index ac7ead7d3..8e6c9b2f8 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
@@ -22,7 +22,7 @@ import java.net.URI;
import java.time.Duration;
import java.util.stream.Stream;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import org.apache.commons.lang3.builder.CompareToBuilder;
import org.awaitility.Awaitility;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java
index c575cca98..c5cdc7ff8 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java
@@ -25,6 +25,7 @@ import org.kie.kogito.explainability.api.LIMEExplainabilityRequest;
import org.kie.kogito.explainability.api.ModelIdentifier;
import io.smallrye.mutiny.helpers.test.AssertSubscriber;
+import mutiny.zero.flow.adapters.AdaptersToReactiveStreams;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,7 +36,7 @@ class ExplainabilityRequestProducerTest {
AssertSubscriber<String> subscriber = AssertSubscriber.create(1);
ExplainabilityRequestProducer producer = new ExplainabilityRequestProducer();
- producer.getEventPublisher().subscribe(subscriber);
+ producer.getEventPublisher().subscribe(AdaptersToReactiveStreams.subscriber(subscriber));
producer.sendEvent(new LIMEExplainabilityRequest(
"executionId", "http://localhost:8080/model",
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
index a045439cb..c32b031fa 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.mocks;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotFoundException;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.query.Query;
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
index ea32a4820..69d2cd0de 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
@@ -22,12 +22,12 @@ import org.junit.jupiter.api.Test;
import org.kie.kogito.testcontainers.quarkus.InfinispanQuarkusTestResource;
import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.is;
-@NativeImageTest
+@QuarkusIntegrationTest
@QuarkusTestResource(InfinispanQuarkusTestResource.class)
public class NativeInfinispanTrustyServiceIT {
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
index 0adc748c4..76674607f 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
@@ -20,7 +20,7 @@ package org.kie.kogito.trusty.storage.api.model;
import java.util.Objects;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.kie.kogito.ModelDomain;
import org.kie.kogito.trusty.storage.api.model.decision.Decision;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
index 0e2f88c30..0d685d034 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.storage.api.model.decision;
import java.util.Collection;
import java.util.List;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.kie.kogito.ModelDomain;
import org.kie.kogito.trusty.storage.api.model.Execution;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
index 3dd0d6d2c..c6b63b4a7 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.storage.api.model.process;
import java.util.Collection;
import java.util.List;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.kie.kogito.ModelDomain;
import org.kie.kogito.trusty.storage.api.model.Execution;
diff --git a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
index 5b466b32c..1062295ad 100644
--- a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
+++ b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.common;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
index 4019b0015..f9d5eed48 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.storage.infinispan;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.infinispan.client.hotrod.exceptions.HotRodClientException;
import org.kie.kogito.trusty.storage.api.StorageExceptionsProvider;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
index 46d7c5993..0fd3f3c45 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
@@ -20,9 +20,9 @@ package org.kie.kogito.trusty.storage.infinispan;
import java.io.IOException;
-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 org.infinispan.protostream.FileDescriptorSource;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
index 34d80b0ca..bdc667512 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
@@ -20,7 +20,7 @@ package org.kie.kogito.trusty.storage.postgresql;
import java.util.Map;
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.query.Query;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
index 5d864d679..557a3fd60 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
index 5d32a751d..bfecf64ff 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
index d65c93d5b..b82edfa73 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
import org.kie.kogito.trusty.storage.api.model.decision.DMNModelWithMetadata;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
index 088ac2254..ec0e3ef40 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
import org.kie.kogito.trusty.storage.api.model.decision.Decision;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
index 4a9682177..26f9859c5 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.LIMEExplainabilityResult;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
index 84708d27b..3ac411891 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.hibernate.exception.JDBCConnectionException;
import org.kie.kogito.trusty.storage.api.StorageExceptionsProvider;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
index 7e78902a8..2adb6a2db 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
@@ -18,8 +18,10 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.inject.Inject;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
@@ -29,15 +31,15 @@ import org.kie.kogito.persistence.api.StorageService;
import org.kie.kogito.trusty.storage.api.model.decision.DMNModelWithMetadata;
import org.kie.kogito.trusty.storage.api.model.decision.Decision;
-import io.quarkus.arc.AlternativePriority;
import io.quarkus.arc.properties.IfBuildProperty;
import static java.lang.String.format;
import static org.kie.kogito.persistence.api.factory.Constants.PERSISTENCE_TYPE_PROPERTY;
import static org.kie.kogito.persistence.postgresql.Constants.POSTGRESQL_STORAGE;
+@Alternative
+@Priority(1)
@ApplicationScoped
-@AlternativePriority(1)
@IfBuildProperty(name = PERSISTENCE_TYPE_PROPERTY, stringValue = POSTGRESQL_STORAGE)
public class PostgresStorageService implements StorageService {
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
index c27f0f914..a4e939c89 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
@@ -18,10 +18,10 @@
*/
package org.kie.kogito.trusty.storage.redis;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.annotation.PostConstruct;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
import org.kie.kogito.persistence.redis.index.RedisCreateIndexEvent;
import org.kie.kogito.persistence.redis.index.RedisIndexManager;
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
index a76720612..a5433220a 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.storage.redis;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.kie.kogito.trusty.storage.api.StorageExceptionsProvider;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org