From e4b52c1686468765e8ef41e878b099c6c6c18116 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:32:26 +0100 Subject: [PATCH 01/20] Removing oracle driver and associated tests (#1971) * Removing oracle driver and associated tests * Revert "Removing oracle driver and associated tests" This reverts commit 5ec3419e0aa9abca21fa69433534b8dd4f1c6020. * Refactory tests * Removing container * Changing names, from oracle to jdbc * Fixing graphql dependency * Renaming oracle package to jdbc * Renaming modules as per Enrique's comments --- .../AbstractProcessDataIndexOracleIT.java | 40 ----- .../oracle/ProcessDataIndexOracleHttpIT.java | 29 --- .../oracle/ProcessDataIndexOracleKafkaIT.java | 29 --- .../quarkus/http/OracleHttpTestProfile.java | 37 ---- .../quarkus/kafka/OracleKafkaTestProfile.java | 36 ---- .../index/ProcessDataIndexOracleIT.java | 61 ------- .../DataIndexOracleSpringTestResource.java | 42 ----- data-index/data-index-common/pom.xml | 4 + .../kogito/index/api}/DateTimeCoercing.java | 2 +- .../index/api}/DefaultDateTimeCoercing.java | 2 +- .../graphql/GraphQLScalarTypeProducer.java | 2 + .../graphql/PostgreSqlDateTimeCoercing.java | 51 ------ .../DateTimeScalarTypeProducerTest.java | 1 + .../graphql/DefaultDateTimeCoercingTest.java | 1 + .../graphql/query/GraphQLQueryMapperTest.java | 2 +- .../data-index-service-oracle/pom.xml | 145 --------------- .../src/main/resources/application.properties | 39 ---- .../src/test/docker/docker-compose.yml | 71 -------- .../graphql/OracleDateTimeCoercingTest.java | 89 --------- .../messaging/OracleMessagingLoadKafkaIT.java | 32 ---- .../test/InMemoryMessageTestProfile.java | 36 ---- .../service/test/KafkaMessageTestProfile.java | 42 ----- .../service/test/KeycloakTestProfile.java | 59 ------ .../src/test/resources/application.properties | 63 ------- .../PostgreSqlDateTimeCoercingTest.java | 89 --------- data-index/data-index-service/pom.xml | 1 - .../pom.xml | 83 ++++----- .../index/jpa/mapper/JobEntityMapper.java | 0 .../mapper/ProcessDefinitionEntityMapper.java | 0 .../mapper/ProcessInstanceEntityMapper.java | 0 .../mapper/UserTaskInstanceEntityMapper.java | 0 .../index/jpa/model/AbstractEntity.java | 0 .../index/jpa/model/AttachmentEntity.java | 0 .../kogito/index/jpa/model/CommentEntity.java | 0 .../kie/kogito/index/jpa/model/JobEntity.java | 0 .../index/jpa/model/JobEntityRepository.java | 0 .../index/jpa/model/MilestoneEntity.java | 0 .../index/jpa/model/MilestoneEntityId.java | 0 .../kogito/index/jpa/model/NodeEntity.java | 0 .../kogito/index/jpa/model/NodeEntityId.java | 0 .../index/jpa/model/NodeInstanceEntity.java | 0 .../jpa/model/ProcessDefinitionEntity.java | 0 .../jpa/model/ProcessDefinitionEntityId.java | 0 .../ProcessDefinitionEntityRepository.java | 0 .../jpa/model/ProcessInstanceEntity.java | 0 .../ProcessInstanceEntityRepository.java | 0 .../jpa/model/ProcessInstanceErrorEntity.java | 0 .../jpa/model/UserTaskInstanceEntity.java | 0 .../UserTaskInstanceEntityRepository.java | 0 .../storage/AbstractJPAStorageFetcher.java | 18 ++ .../index/jpa/storage/AbstractStorage.java | 0 .../storage/JPADataIndexStorageService.java | 0 .../jpa/storage/JPADateTimeCoercing.java} | 10 +- .../kogito/index/jpa/storage/JPAQuery.java | 0 .../index/jpa/storage/JPAStorageService.java | 0 .../index/jpa/storage/JobEntityStorage.java | 0 .../ProcessDefinitionEntityStorage.java | 0 .../storage/ProcessInstanceEntityStorage.java | 0 .../UserTaskInstanceEntityStorage.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../mapper/AbstractJobEntityMapperIT.java} | 8 +- ...tractProcessDefinitionEntityMapperIT.java} | 8 +- ...bstractProcessInstanceEntityMapperIT.java} | 13 +- ...stractUserTaskInstanceEntityMapperIT.java} | 8 +- .../jpa/query/AbstractJobEntityQueryIT.java} | 10 +- ...stractProcessDefinitionEntityQueryIT.java} | 10 +- ...AbstractProcessInstanceEntityQueryIT.java} | 15 +- ...bstractUserTaskInstanceEntityQueryIT.java} | 10 +- .../jpa/storage/AbstractJobStorageIT.java} | 12 +- .../AbstractProcessDefinitionStorageIT.java} | 15 +- .../AbstractProcessInstanceStorageIT.java} | 10 +- .../index/jpa}/storage/AbstractStorageIT.java | 2 +- .../AbstractUserTaskInstanceStorageIT.java} | 24 +-- .../index/jpa}/storage/DomainQueryTest.java | 3 +- .../data-index-storage-jpa/pom.xml | 71 ++++++-- .../jdbc/JdbcStorageServiceProducer.java} | 6 +- .../index/jdbc}/JsonBinaryConverter.java | 2 +- .../src/main/resources/META-INF/orm.xml | 8 +- .../migration/V1.33.0__data_index_create.sql | 0 .../V1.44.0__data_index_definitions.sql | 0 ...V1.45.0.0__data_index_node_definitions.sql | 0 ....0.1__add_identity_to_process_instance.sql | 0 ....2__data_index_definitions_add_collums.sql | 0 .../index/jdbc/mapper/JobEntityMapperIT.java} | 9 +- .../ProcessDefinitionEntityMapperIT.java} | 9 +- .../ProcessInstanceEntityMapperIT.java} | 8 +- .../UserTaskInstanceEntityMapperIT.java} | 8 +- .../index/jdbc/query/JobEntityQueryIT.java | 31 ++++ .../query/ProcessDefinitionEntityQueryIT.java | 31 ++++ .../query/ProcessInstanceEntityQueryIT.java | 35 ++++ .../query/UserTaskInstanceEntityQueryIT.java | 31 ++++ .../index/jdbc/storage/JobStorageIT.java | 31 ++++ .../storage/ProcessDefinitionStorageIT.java | 31 ++++ .../storage/ProcessInstanceStorageIT.java | 30 ++++ .../storage/UserTaskInstanceStorageIT.java | 30 ++++ .../src/test/resources/application.properties | 8 +- .../src/main/resources/META-INF/beans.xml | 20 --- .../oracle/schema/DDLSchemaExporter.java | 81 --------- .../data-index-storage-postgresql/pom.xml | 9 +- .../postgresql/mapper/JobEntityMapperIT.java | 83 +-------- .../ProcessDefinitionEntityMapperIT.java | 82 +-------- .../mapper/ProcessInstanceEntityMapperIT.java | 163 +---------------- .../UserTaskInstanceEntityMapperIT.java | 145 +-------------- .../postgresql/query/JobEntityQueryIT.java | 18 +- .../query/ProcessDefinitionEntityQueryIT.java | 22 +-- .../query/ProcessInstanceEntityQueryIT.java | 21 +-- .../query/UserTaskInstanceEntityQueryIT.java | 20 +-- .../postgresql/storage/AbstractStorageIT.java | 59 ------ .../postgresql/storage/DomainQueryTest.java | 170 ------------------ .../postgresql/storage/JobStorageIT.java | 49 +---- .../storage/ProcessDefinitionStorageIT.java | 45 +---- .../storage/ProcessInstanceStorageIT.java | 28 +-- .../storage/UserTaskInstanceStorageIT.java | 29 +-- data-index/data-index-storage/pom.xml | 4 +- .../containers/DataIndexOracleContainer.java | 44 ----- ...ataIndexOracleHttpQuarkusTestResource.java | 38 ---- .../http/DataIndexOracleHttpResource.java | 79 -------- .../kafka/DataIndexOracleKafkaResource.java | 92 ---------- ...taIndexOracleQuarkusKafkaTestResource.java | 41 ----- kogito-apps-bom/pom.xml | 27 ++- 120 files changed, 470 insertions(+), 2542 deletions(-) delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java rename data-index/{data-index-graphql/src/main/java/org/kie/kogito/index/graphql => data-index-common/src/main/java/org/kie/kogito/index/api}/DateTimeCoercing.java (96%) rename data-index/{data-index-graphql/src/main/java/org/kie/kogito/index/graphql => data-index-common/src/main/java/org/kie/kogito/index/api}/DefaultDateTimeCoercing.java (98%) delete mode 100644 data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java delete mode 100644 data-index/data-index-service/data-index-service-oracle/pom.xml delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java delete mode 100644 data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties delete mode 100644 data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa-common}/pom.xml (58%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/AbstractEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/JobEntityRepository.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntityId.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/NodeEntityId.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityId.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityRepository.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntityRepository.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntityRepository.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/AbstractJPAStorageFetcher.java (69%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/JPADataIndexStorageService.java (100%) rename data-index/{data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java => data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPADateTimeCoercing.java} (80%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/JPAQuery.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/JPAStorageService.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/JobEntityStorage.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java (100%) rename data-index/data-index-storage/{data-index-storage-jpa => data-index-storage-jpa-common}/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java (100%) rename data-index/{data-index-service/data-index-service-oracle => data-index-storage/data-index-storage-jpa-common}/src/main/resources/META-INF/beans.xml (100%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractJobEntityMapperIT.java} (95%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessDefinitionEntityMapperIT.java} (94%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessInstanceEntityMapperIT.java} (96%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractUserTaskInstanceEntityMapperIT.java} (97%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractJobEntityQueryIT.java} (77%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessDefinitionEntityQueryIT.java} (77%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessInstanceEntityQueryIT.java} (71%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractUserTaskInstanceEntityQueryIT.java} (77%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractJobStorageIT.java} (85%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractProcessDefinitionStorageIT.java} (79%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractProcessInstanceStorageIT.java} (84%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa}/storage/AbstractStorageIT.java (97%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractUserTaskInstanceStorageIT.java} (68%) rename data-index/data-index-storage/{data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle => data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa}/storage/DomainQueryTest.java (98%) rename data-index/data-index-storage/{data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/OracleStorageServiceProducer.java => data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc/JdbcStorageServiceProducer.java} (95%) rename data-index/data-index-storage/{data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle => data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc}/JsonBinaryConverter.java (97%) rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa}/src/main/resources/META-INF/orm.xml (78%) rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa}/src/main/resources/db/migration/V1.33.0__data_index_create.sql (100%) rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa}/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql (100%) rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa}/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql (100%) rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa}/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql (100%) rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa}/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql (100%) rename data-index/{data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java => data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/JobEntityMapperIT.java} (75%) rename data-index/{data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java => data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessDefinitionEntityMapperIT.java} (75%) rename data-index/{data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java => data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessInstanceEntityMapperIT.java} (76%) rename data-index/{data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java => data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/UserTaskInstanceEntityMapperIT.java} (75%) create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/JobEntityQueryIT.java create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessDefinitionEntityQueryIT.java create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessInstanceEntityQueryIT.java create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/UserTaskInstanceEntityQueryIT.java create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/JobStorageIT.java create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessDefinitionStorageIT.java create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessInstanceStorageIT.java create mode 100644 data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/UserTaskInstanceStorageIT.java rename data-index/data-index-storage/{data-index-storage-oracle => data-index-storage-jpa}/src/test/resources/application.properties (84%) delete mode 100644 data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml delete mode 100644 data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java delete mode 100644 data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java delete mode 100644 data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java delete mode 100644 data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java delete mode 100644 data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java delete mode 100644 data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java delete mode 100644 data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java delete mode 100644 data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java deleted file mode 100644 index fd5d48fccd..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.oracle; - -import org.kie.kogito.index.AbstractProcessDataIndexIT; -import org.kie.kogito.test.quarkus.QuarkusTestProperty; - -import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL; - -public abstract class AbstractProcessDataIndexOracleIT extends AbstractProcessDataIndexIT { - - @QuarkusTestProperty(name = KOGITO_DATA_INDEX_SERVICE_URL) - String dataIndex; - - @Override - public String getDataIndexURL() { - return dataIndex; - } - - @Override - public boolean validateDomainData() { - return false; - } -} diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java deleted file mode 100644 index d323cbc6e0..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.oracle; - -import org.kie.kogito.index.quarkus.http.OracleHttpTestProfile; - -import io.quarkus.test.junit.QuarkusIntegrationTest; -import io.quarkus.test.junit.TestProfile; - -@QuarkusIntegrationTest -@TestProfile(OracleHttpTestProfile.class) -public class ProcessDataIndexOracleHttpIT extends AbstractProcessDataIndexOracleIT { -} diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java deleted file mode 100644 index bfcd0a7486..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.oracle; - -import org.kie.kogito.index.quarkus.kafka.OracleKafkaTestProfile; - -import io.quarkus.test.junit.QuarkusIntegrationTest; -import io.quarkus.test.junit.TestProfile; - -@QuarkusIntegrationTest -@TestProfile(OracleKafkaTestProfile.class) -public class ProcessDataIndexOracleKafkaIT extends AbstractProcessDataIndexOracleIT { -} diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java deleted file mode 100644 index e8bc357953..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.quarkus.http; - -import java.util.Arrays; -import java.util.List; - -import org.kie.kogito.index.test.quarkus.http.DataIndexOracleHttpQuarkusTestResource; -import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource; - -import io.quarkus.test.junit.QuarkusTestProfile; - -public class OracleHttpTestProfile implements QuarkusTestProfile { - - @Override - public List testResources() { - return Arrays.asList(new TestResourceEntry(KogitoServiceRandomPortQuarkusHttpTestResource.class), - new TestResourceEntry(DataIndexOracleHttpQuarkusTestResource.class)); - } - -} diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java deleted file mode 100644 index 4e129fb0f0..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.quarkus.kafka; - -import java.util.Arrays; -import java.util.List; - -import org.kie.kogito.index.test.quarkus.kafka.DataIndexOracleQuarkusKafkaTestResource; - -import io.quarkus.test.junit.QuarkusTestProfile; - -public class OracleKafkaTestProfile implements QuarkusTestProfile { - - @Override - public List testResources() { - return Arrays.asList(new TestResourceEntry(KogitoServiceRandomPortQuarkusKafkaTestResource.class), - new TestResourceEntry(DataIndexOracleQuarkusKafkaTestResource.class)); - } - -} 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 deleted file mode 100644 index 9f9278ce26..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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; - -import org.junit.jupiter.api.BeforeEach; -import org.kie.kogito.KogitoApplication; -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.test.web.server.LocalServerPort; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; - -import io.restassured.RestAssured; - -import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL; - -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class }) -@ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexOracleSpringTestResource.class }) -@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -public class ProcessDataIndexOracleIT extends SpringBootAbstractProcessInstanceIT { - - @LocalServerPort - private int httpPort; - - @Value("${" + KOGITO_DATA_INDEX_SERVICE_URL + "}") - private String dataIndexUrl; - - @Override - public String getDataIndexURL() { - return dataIndexUrl; - } - - @Override - public boolean validateDomainData() { - return false; - } - - @BeforeEach - public void setup() { - RestAssured.port = httpPort; - } - -} diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java deleted file mode 100644 index fd8d1ef41c..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.spring; - -import java.util.HashMap; -import java.util.Map; - -import org.kie.kogito.index.test.quarkus.kafka.DataIndexOracleKafkaResource; -import org.kie.kogito.test.resources.ConditionalSpringBootTestResource; - -import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL; - -public class DataIndexOracleSpringTestResource extends ConditionalSpringBootTestResource { - public DataIndexOracleSpringTestResource() { - super(new DataIndexOracleKafkaResource()); - } - - @Override - protected Map getProperties() { - Map properties = new HashMap<>(); - properties.put(KOGITO_DATA_INDEX_SERVICE_URL, "http://localhost:" + getTestResource().getMappedPort()); - properties.putAll(getTestResource().getProperties()); - return properties; - } - -} diff --git a/data-index/data-index-common/pom.xml b/data-index/data-index-common/pom.xml index b11b7d92e4..2bb8c27e15 100644 --- a/data-index/data-index-common/pom.xml +++ b/data-index/data-index-common/pom.xml @@ -45,6 +45,10 @@ org.kie.kogito kogito-events-core + + com.graphql-java + graphql-java + io.quarkus quarkus-jackson diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DateTimeCoercing.java similarity index 96% rename from data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java rename to data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DateTimeCoercing.java index 3b72407932..621bf6d716 100644 --- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java +++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DateTimeCoercing.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.graphql; +package org.kie.kogito.index.api; import graphql.schema.Coercing; diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DefaultDateTimeCoercing.java similarity index 98% rename from data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java rename to data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DefaultDateTimeCoercing.java index 9bdde6dce1..95fba82147 100644 --- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java +++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DefaultDateTimeCoercing.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.graphql; +package org.kie.kogito.index.api; import java.time.DateTimeException; import java.time.Instant; 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 84f5744804..e84698c831 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,6 +18,8 @@ */ package org.kie.kogito.index.graphql; +import org.kie.kogito.index.api.DateTimeCoercing; + import graphql.schema.GraphQLScalarType; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; 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 deleted file mode 100644 index e4001bb797..0000000000 --- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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.graphql; - -import java.time.ZonedDateTime; - -import io.quarkus.arc.properties.IfBuildProperty; - -import graphql.language.StringValue; -import jakarta.enterprise.context.ApplicationScoped; - -import static org.kie.kogito.persistence.api.factory.Constants.PERSISTENCE_TYPE_PROPERTY; - -@ApplicationScoped -@IfBuildProperty(name = PERSISTENCE_TYPE_PROPERTY, stringValue = "postgresql") -public class PostgreSqlDateTimeCoercing extends DefaultDateTimeCoercing implements DateTimeCoercing { - - @Override - public Object parseValue(Object input) { - return input == null ? null : getZonedDateTime((String) input); - } - - private ZonedDateTime getZonedDateTime(String input) { - return parseDateTime(input); - } - - @Override - public Object parseLiteral(Object input) { - if (input instanceof StringValue) { - return getZonedDateTime(((StringValue) input).getValue()); - } else { - return null; - } - } -} diff --git a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java index 224e45fce3..4558cffd97 100644 --- a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java +++ b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java @@ -19,6 +19,7 @@ package org.kie.kogito.index.graphql; import org.junit.jupiter.api.Test; +import org.kie.kogito.index.api.DefaultDateTimeCoercing; import graphql.schema.GraphQLScalarType; diff --git a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java index 46aa657512..0f60f439e9 100644 --- a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java +++ b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java @@ -25,6 +25,7 @@ import java.time.temporal.ChronoUnit; import org.junit.jupiter.api.Test; +import org.kie.kogito.index.api.DefaultDateTimeCoercing; import graphql.language.StringValue; import graphql.schema.CoercingSerializeException; diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java index ebcca023fd..6caec6c860 100644 --- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java +++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.kie.kogito.index.graphql.DefaultDateTimeCoercing; +import org.kie.kogito.index.api.DefaultDateTimeCoercing; import org.kie.kogito.index.graphql.GraphQLScalarTypeProducer; import org.kie.kogito.index.graphql.query.GraphQLQueryParser; import org.kie.kogito.index.graphql.query.GraphQLQueryParserRegistry; diff --git a/data-index/data-index-service/data-index-service-oracle/pom.xml b/data-index/data-index-service/data-index-service-oracle/pom.xml deleted file mode 100644 index 1177d01818..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - data-index-service - org.kie.kogito - 999-SNAPSHOT - - 4.0.0 - - data-index-service-oracle - Kogito Apps :: Data Index Service with Oracle - - - org.kie.kogito.index.service.oracle - - - - - org.kie.kogito - data-index-service-common - - - org.kie.kogito - data-index-storage-oracle - - - io.quarkus - quarkus-smallrye-reactive-messaging-kafka - - - io.quarkus - quarkus-container-image-jib - - - io.quarkus - quarkus-flyway - - - - org.kie.kogito - data-index-test-utils - test - - - org.kie.kogito - data-index-service-common - test-jar - test - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.mockito - mockito-junit-jupiter - test - - - org.assertj - assertj-core - test - - - org.kie.kogito - kogito-quarkus-test-utils - test - - - org.keycloak - keycloak-core - test - - - org.awaitility - awaitility - test - - - io.smallrye.reactive - smallrye-reactive-messaging-in-memory - test - - - - - - - io.quarkus - quarkus-maven-plugin - - true - - - - - build - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-test - - integration-test - verify - - - - - - - \ No newline at end of file diff --git a/data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties deleted file mode 100644 index 6ee6ffb0cd..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties +++ /dev/null @@ -1,39 +0,0 @@ -# -# 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. -# - -#Data Index -kogito.apps.persistence.type=oracle -kogito.data-index.domain-indexing=false -kogito.data-index.blocking=true - -#Kafka -quarkus.kafka.health.enabled=true - -quarkus.datasource.db-kind=oracle - -#Hibernate -quarkus.hibernate-orm.jdbc.timezone=UTC -quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy -# Normalizing timezones storage as Hibernate ORM 5 for backwards compatibility. -quarkus.hibernate-orm.mapping.timezone.default-storage=normalize - -#Container image -quarkus.container-image.build=${quarkus.build.image:true} -quarkus.container-image.group=org.kie.kogito -quarkus.jib.jvm-arguments=-Dquarkus.http.port=8080 diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml deleted file mode 100644 index 25578f35ed..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml +++ /dev/null @@ -1,71 +0,0 @@ -# -# 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. -# - -version: "3" - -networks: - default: - driver: bridge - enable_ipv6: false - ipam: - config: - - subnet: 172.16.57.0/24 - -services: - zookeeper: - image: strimzi/kafka:0.20.1-kafka-2.6.0 - container_name: data-index-zookeeper - command: [ - "sh", "-c", - "bin/zookeeper-server-start.sh config/zookeeper.properties" - ] - ports: - - "2181:2181" - environment: - LOG_DIR: "/tmp/logs" - - kafka: - image: strimzi/kafka:0.20.1-kafka-2.6.0 - container_name: data-index-kafka - command: [ - "sh", "-c", - "bin/kafka-server-start.sh config/server.properties --override inter.broker.listener.name=$${KAFKA_INTER_BROKER_LISTENER_NAME} --override listener.security.protocol.map=$${KAFKA_LISTENER_SECURITY_PROTOCOL_MAP} --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}" - ] - depends_on: - - zookeeper - ports: - - "9092:9092" - environment: - KAFKA_BROKER_ID: 0 - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 - KAFKA_LISTENERS: INTERNAL://kafka:29092,EXTERNAL://kafka:9092 - KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:29092,EXTERNAL://localhost:9092 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT - KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL - KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true" - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 - LOG_DIR: "/tmp/logs" - - oracle: - image: gvenzl/oracle-xe:21.3.0-slim - container_name: data-index-oracle - environment: - ORACLE_PASSWORD: test - ports: - - 1521:1521 diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java deleted file mode 100644 index 92148ad792..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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.service.graphql; - -import java.time.ZonedDateTime; - -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.graphql.OracleDateTimeCoercing; - -import graphql.language.StringValue; -import graphql.schema.CoercingSerializeException; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - -public class OracleDateTimeCoercingTest { - - OracleDateTimeCoercing dateTimeCoercing = new OracleDateTimeCoercing(); - - @Test - public void testParseValueAsZonedDateTime() { - assertThat(dateTimeCoercing.parseValue(null)).isNull(); - assertThat(dateTimeCoercing.parseValue("2019-11-20T03:14:03.075Z")) - .isEqualTo(ZonedDateTime.parse("2019-11-20T03:14:03.075Z")); - } - - @Test - public void testParseLiteral() { - assertThat(dateTimeCoercing.parseLiteral(null)).isNull(); - assertThat(dateTimeCoercing.parseLiteral(new StringValue("2019-11-20T03:14:03.075Z"))) - .isEqualTo(ZonedDateTime.parse("2019-11-20T03:14:03.075Z")); - } - - @Test - public void testSerializeInvalidString() { - try { - dateTimeCoercing.serialize("test"); - fail("Method should throw CoercingSerializeException"); - } catch (CoercingSerializeException ex) { - assertThat(ex.getMessage()) - .isEqualTo("Invalid ISO-8601 value : 'test'. because of : 'Text 'test' could not be parsed at index 0'"); - } - } - - @Test - public void testSerializeNull() { - try { - dateTimeCoercing.serialize(null); - fail("Method should throw CoercingSerializeException"); - } catch (CoercingSerializeException ex) { - assertThat(ex.getMessage()) - .isEqualTo("Expected something we can convert to 'java.time.ZonedDateTime' but was 'null'."); - } - } - - @Test - public void testSerializeInvalidType() { - try { - dateTimeCoercing.serialize(1); - fail("Method should throw CoercingSerializeException"); - } catch (CoercingSerializeException ex) { - assertThat(ex.getMessage()) - .isEqualTo("Expected something we can convert to 'java.time.ZonedDateTime' but was 'java.lang.Integer'."); - } - } - - @Test - public void testSerializeString() { - String result = dateTimeCoercing.serialize("2019-08-20T19:26:02.092+00:00"); - assertThat(result).isEqualTo("2019-08-20T19:26:02.092Z"); - } - -} diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java deleted file mode 100644 index c36e54f125..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.service.messaging; - -import org.junit.jupiter.api.Disabled; -import org.kie.kogito.index.service.test.KafkaMessageTestProfile; - -import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.TestProfile; - -@QuarkusTest -@TestProfile(KafkaMessageTestProfile.class) -@Disabled -class OracleMessagingLoadKafkaIT extends AbstractMessagingLoadKafkaIT { - -} diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java deleted file mode 100644 index 27bfc31fb6..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.service.test; - -import java.util.Arrays; -import java.util.List; - -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.junit.QuarkusTestProfile; - -public class InMemoryMessageTestProfile implements QuarkusTestProfile { - - @Override - public List testResources() { - return Arrays.asList( - new TestResourceEntry(InMemoryMessagingTestResource.class), - new TestResourceEntry(OracleSqlQuarkusTestResource.class)); - } -} diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java deleted file mode 100644 index babcab6b20..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.service.test; - -import java.util.Arrays; -import java.util.List; - -import org.kie.kogito.testcontainers.quarkus.KafkaQuarkusTestResource; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.junit.QuarkusTestProfile; - -public class KafkaMessageTestProfile implements QuarkusTestProfile { - - @Override - public List testResources() { - return Arrays.asList( - new TestResourceEntry(OracleSqlQuarkusTestResource.class), - new TestResourceEntry(KafkaQuarkusTestResource.class)); - } - - @Override - public String getConfigProfile() { - return "kafka-events-support"; - } -} diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java deleted file mode 100644 index f171568214..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.service.test; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.junit.QuarkusTestProfile; - -import static java.util.Collections.singletonMap; -import static org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource.KOGITO_OIDC_TENANTS; - -public class KeycloakTestProfile implements QuarkusTestProfile { - - @Override - public Map getConfigOverrides() { - Map config = new HashMap<>(); - config.put("quarkus.http.auth.policy.role-policy1.roles-allowed", "confidential"); - config.put("quarkus.http.auth.permission.roles1.paths", "/*"); - config.put("quarkus.http.auth.permission.roles1.policy", "role-policy1"); - return config; - } - - @Override - public String getConfigProfile() { - return "keycloak-test"; - } - - @Override - public List testResources() { - Map args = singletonMap(KOGITO_OIDC_TENANTS, "web-app-tenant"); - return Arrays.asList( - new TestResourceEntry(OracleSqlQuarkusTestResource.class), - new TestResourceEntry(InMemoryMessagingTestResource.class), - new TestResourceEntry(KeycloakQuarkusTestResource.class, args)); - } - -} diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties b/data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties deleted file mode 100644 index 1e250e5239..0000000000 --- a/data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties +++ /dev/null @@ -1,63 +0,0 @@ -# -# 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. -# - -#Data Index -kogito.apps.persistence.type=oracle -kogito.data-index.domain-indexing=false -kogito.data-index.blocking=true -kogito.data-index.vertx-graphql.ui.path=/graphiql -kogito.data-index.vertx-graphql.ui.tenant=web-app-tenant - -#Flyway -quarkus.flyway.migrate-at-start=true -quarkus.flyway.baseline-on-migrate=true - -# Kafka -kafka.bootstrap.servers=localhost:9092 -# Persistence -quarkus.datasource.db-kind=oracle -quarkus.datasource.username=test -quarkus.datasource.password=test -quarkus.datasource.jdbc.url=jdbc:oracle://localhost:1521/XEPDB1 - -#Hibernate -quarkus.hibernate-orm.jdbc.timezone=UTC -quarkus.hibernate-orm.database.generation.halt-on-error=true -quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy - -# Security -quarkus.oidc.enabled=false -quarkus.oidc.tenant-enabled=false -quarkus.oidc.auth-server-url=none - -# Keycloak oidc -%keycloak-test.quarkus.oidc.enabled=true -%keycloak-test.quarkus.oidc.tenant-enabled=true -#%keycloak-test.quarkus.oidc.auth-server-url=http://localhost:8281/auth/realms/kogito -%keycloak-test.quarkus.oidc.client-id=kogito-app -%keycloak-test.quarkus.oidc.credentials.secret=secret -%keycloak-test.quarkus.oidc.application-type=service - -#%keycloak-test.quarkus.oidc.web-app-tenant.auth-server-url=http://localhost:8281/auth/realms/kogito -%keycloak-test.quarkus.oidc.web-app-tenant.client-id=kogito-app -%keycloak-test.quarkus.oidc.web-app-tenant.credentials.secret=secret -%keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app - -# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource -quarkus.keycloak.devservices.enabled=false diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java deleted file mode 100644 index 9ac63e7352..0000000000 --- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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.service.graphql; - -import java.time.ZonedDateTime; - -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.graphql.PostgreSqlDateTimeCoercing; - -import graphql.language.StringValue; -import graphql.schema.CoercingSerializeException; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - -public class PostgreSqlDateTimeCoercingTest { - - PostgreSqlDateTimeCoercing dateTimeCoercing = new PostgreSqlDateTimeCoercing(); - - @Test - public void testParseValueAsZonedDateTime() { - assertThat(dateTimeCoercing.parseValue(null)).isNull(); - assertThat(dateTimeCoercing.parseValue("2019-11-20T03:14:03.075Z")) - .isEqualTo(ZonedDateTime.parse("2019-11-20T03:14:03.075Z")); - } - - @Test - public void testParseLiteral() { - assertThat(dateTimeCoercing.parseLiteral(null)).isNull(); - assertThat(dateTimeCoercing.parseLiteral(new StringValue("2019-11-20T03:14:03.075Z"))) - .isEqualTo(ZonedDateTime.parse("2019-11-20T03:14:03.075Z")); - } - - @Test - public void testSerializeInvalidString() { - try { - dateTimeCoercing.serialize("test"); - fail("Method should throw CoercingSerializeException"); - } catch (CoercingSerializeException ex) { - assertThat(ex.getMessage()) - .isEqualTo("Invalid ISO-8601 value : 'test'. because of : 'Text 'test' could not be parsed at index 0'"); - } - } - - @Test - public void testSerializeNull() { - try { - dateTimeCoercing.serialize(null); - fail("Method should throw CoercingSerializeException"); - } catch (CoercingSerializeException ex) { - assertThat(ex.getMessage()) - .isEqualTo("Expected something we can convert to 'java.time.ZonedDateTime' but was 'null'."); - } - } - - @Test - public void testSerializeInvalidType() { - try { - dateTimeCoercing.serialize(1); - fail("Method should throw CoercingSerializeException"); - } catch (CoercingSerializeException ex) { - assertThat(ex.getMessage()) - .isEqualTo("Expected something we can convert to 'java.time.ZonedDateTime' but was 'java.lang.Integer'."); - } - } - - @Test - public void testSerializeString() { - String result = dateTimeCoercing.serialize("2019-08-20T19:26:02.092+00:00"); - assertThat(result).isEqualTo("2019-08-20T19:26:02.092Z"); - } - -} diff --git a/data-index/data-index-service/pom.xml b/data-index/data-index-service/pom.xml index 48be5911aa..cdc2c04d47 100644 --- a/data-index/data-index-service/pom.xml +++ b/data-index/data-index-service/pom.xml @@ -37,7 +37,6 @@ data-index-service-postgresql data-index-service-infinispan data-index-service-mongodb - data-index-service-oracle diff --git a/data-index/data-index-storage/data-index-storage-oracle/pom.xml b/data-index/data-index-storage/data-index-storage-jpa-common/pom.xml similarity index 58% rename from data-index/data-index-storage/data-index-storage-oracle/pom.xml rename to data-index/data-index-storage/data-index-storage-jpa-common/pom.xml index fa5409ddc4..d9d262ac0f 100644 --- a/data-index/data-index-storage/data-index-storage-oracle/pom.xml +++ b/data-index/data-index-storage/data-index-storage-jpa-common/pom.xml @@ -29,21 +29,30 @@ 4.0.0 - data-index-storage-oracle - Kogito Apps :: Data Index Storage Oracle DB + data-index-storage-jpa-common + Kogito Apps :: Data Index Storage JPA common classes - org.kie.kogito.index.oracle + org.kie.kogito.index.jpa.common + org.kie.kogito - data-index-storage-jpa + data-index-storage-api - io.quarkus - quarkus-jdbc-oracle + org.kie.kogito + data-index-common + + + org.kie.kogito + persistence-commons-jpa + + + org.mapstruct + mapstruct org.kie.kogito @@ -51,7 +60,7 @@ test-jar test - + io.quarkus quarkus-junit5-mockito test @@ -72,65 +81,33 @@ test + org.apache.maven.plugins - maven-failsafe-plugin + maven-compiler-plugin - - org.jboss.logmanager.LogManager - + + + org.mapstruct + mapstruct-processor + ${version.org.mapstruct} + + + + + org.apache.maven.plugins + maven-jar-plugin - test - integration-test - verify + test-jar - - - - schema - - - generate.schema - - - - - - org.codehaus.mojo - exec-maven-plugin - - - package - - exec - - - - - java - - -classpath - - - org.kie.kogito.index.oracle.schema.DDLSchemaExporter - - test - - - - - - - \ No newline at end of file diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/AbstractEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AbstractEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/AbstractEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AbstractEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/AttachmentEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/CommentEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/JobEntityRepository.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntityRepository.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/JobEntityRepository.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/JobEntityRepository.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntityId.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntityId.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntityId.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/MilestoneEntityId.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/NodeEntityId.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntityId.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/NodeEntityId.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeEntityId.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/NodeInstanceEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityId.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityId.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityId.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityId.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityRepository.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityRepository.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityRepository.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessDefinitionEntityRepository.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntityRepository.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntityRepository.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntityRepository.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceErrorEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntityRepository.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntityRepository.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntityRepository.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/AbstractJPAStorageFetcher.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractJPAStorageFetcher.java similarity index 69% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/AbstractJPAStorageFetcher.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractJPAStorageFetcher.java index 881b7eb516..a87c7f8eb1 100644 --- a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/AbstractJPAStorageFetcher.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractJPAStorageFetcher.java @@ -1,3 +1,21 @@ +/* + * 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.jpa.storage; import java.util.function.Function; diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JPADataIndexStorageService.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPADataIndexStorageService.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JPADataIndexStorageService.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPADataIndexStorageService.java diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPADateTimeCoercing.java similarity index 80% rename from data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPADateTimeCoercing.java index 1c604cae29..6ac9ef2dd4 100644 --- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPADateTimeCoercing.java @@ -16,20 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.graphql; +package org.kie.kogito.index.jpa.storage; import java.time.ZonedDateTime; -import io.quarkus.arc.properties.IfBuildProperty; +import org.kie.kogito.index.api.DateTimeCoercing; +import org.kie.kogito.index.api.DefaultDateTimeCoercing; import graphql.language.StringValue; import jakarta.enterprise.context.ApplicationScoped; -import static org.kie.kogito.persistence.api.factory.Constants.PERSISTENCE_TYPE_PROPERTY; - @ApplicationScoped -@IfBuildProperty(name = PERSISTENCE_TYPE_PROPERTY, stringValue = "oracle") -public class OracleDateTimeCoercing extends DefaultDateTimeCoercing implements DateTimeCoercing { +public class JPADateTimeCoercing extends DefaultDateTimeCoercing implements DateTimeCoercing { @Override public Object parseValue(Object input) { diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JPAQuery.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPAQuery.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JPAQuery.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPAQuery.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JPAStorageService.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPAStorageService.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JPAStorageService.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JPAStorageService.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JobEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JobEntityStorage.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/JobEntityStorage.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/JobEntityStorage.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java similarity index 100% rename from data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java diff --git a/data-index/data-index-service/data-index-service-oracle/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/resources/META-INF/beans.xml similarity index 100% rename from data-index/data-index-service/data-index-service-oracle/src/main/resources/META-INF/beans.xml rename to data-index/data-index-storage/data-index-storage-jpa-common/src/main/resources/META-INF/beans.xml 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractJobEntityMapperIT.java similarity index 95% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractJobEntityMapperIT.java index a7504f914f..dd8477855d 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractJobEntityMapperIT.java @@ -16,24 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.mapper; +package org.kie.kogito.index.jpa.mapper; import java.time.ZonedDateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.JobEntityMapper; import org.kie.kogito.index.jpa.model.JobEntity; import org.kie.kogito.index.model.Job; -import io.quarkus.test.junit.QuarkusTest; - import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; -@QuarkusTest -class JobEntityMapperIT { +public abstract class AbstractJobEntityMapperIT { @Inject JobEntityMapper mapper; 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessDefinitionEntityMapperIT.java similarity index 94% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessDefinitionEntityMapperIT.java index 4369de3058..3df75e17bf 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessDefinitionEntityMapperIT.java @@ -16,20 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.mapper; +package org.kie.kogito.index.jpa.mapper; import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.ProcessDefinitionEntityMapper; import org.kie.kogito.index.jpa.model.NodeEntity; import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity; import org.kie.kogito.index.model.Node; import org.kie.kogito.index.model.ProcessDefinition; -import io.quarkus.test.junit.QuarkusTest; - import jakarta.inject.Inject; import static java.util.Collections.singleton; @@ -37,8 +34,7 @@ import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; -@QuarkusTest -class ProcessDefinitionEntityMapperIT { +public abstract class AbstractProcessDefinitionEntityMapperIT { ProcessDefinition pd = new ProcessDefinition(); ProcessDefinitionEntity entity = new ProcessDefinitionEntity(); 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessInstanceEntityMapperIT.java similarity index 96% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessInstanceEntityMapperIT.java index 95840d7e1a..1bb4b5a64f 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractProcessInstanceEntityMapperIT.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.mapper; +package org.kie.kogito.index.jpa.mapper; import java.time.ZonedDateTime; import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.ProcessInstanceEntityMapper; import org.kie.kogito.index.jpa.model.MilestoneEntity; import org.kie.kogito.index.jpa.model.MilestoneEntityId; import org.kie.kogito.index.jpa.model.NodeInstanceEntity; @@ -37,16 +36,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.quarkus.test.junit.QuarkusTest; - import jakarta.inject.Inject; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -@QuarkusTest -class ProcessInstanceEntityMapperIT { +public abstract class AbstractProcessInstanceEntityMapperIT { ObjectMapper jsonMapper = new ObjectMapper(); ProcessInstance processInstance = new ProcessInstance(); @@ -72,7 +68,6 @@ void setup() { String testId = "testId"; String processId = "testProcessId"; - String version = "1.0"; Set roles = singleton("testRoles"); ObjectNode variables = jsonMapper.createObjectNode(); variables.put("test", "testValue"); @@ -108,7 +103,6 @@ void setup() { processInstance.setId(testId); processInstance.setProcessId(processId); - processInstance.setVersion(version); processInstance.setRoles(roles); processInstance.setVariables(variables); processInstance.setEndpoint(endpoint); @@ -153,7 +147,6 @@ void setup() { processInstanceEntity.setId(testId); processInstanceEntity.setProcessId(processId); - processInstanceEntity.setVersion(version); processInstanceEntity.setRoles(roles); processInstanceEntity.setVariables(variables); processInstanceEntity.setEndpoint(endpoint); @@ -169,9 +162,9 @@ void setup() { processInstanceEntity.setAddons(addons); processInstanceEntity.setLastUpdate(time); processInstanceEntity.setBusinessKey(businessKey); + processInstanceEntity.setMilestones(singletonList(milestoneEntity)); processInstanceEntity.setCreatedBy(createdBy); processInstanceEntity.setUpdatedBy(updatedBy); - processInstanceEntity.setMilestones(singletonList(milestoneEntity)); } @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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractUserTaskInstanceEntityMapperIT.java similarity index 97% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractUserTaskInstanceEntityMapperIT.java index 167da216df..6d4dd31e24 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/mapper/AbstractUserTaskInstanceEntityMapperIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.mapper; +package org.kie.kogito.index.jpa.mapper; import java.time.ZonedDateTime; import java.util.HashMap; @@ -25,7 +25,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.UserTaskInstanceEntityMapper; import org.kie.kogito.index.jpa.model.AttachmentEntity; import org.kie.kogito.index.jpa.model.CommentEntity; import org.kie.kogito.index.jpa.model.UserTaskInstanceEntity; @@ -36,16 +35,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.quarkus.test.junit.QuarkusTest; - import jakarta.inject.Inject; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -@QuarkusTest -class UserTaskInstanceEntityMapperIT { +public abstract class AbstractUserTaskInstanceEntityMapperIT { UserTaskInstance userTaskInstance = new UserTaskInstance(); UserTaskInstanceEntity userTaskInstanceEntity = new UserTaskInstanceEntity(); 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractJobEntityQueryIT.java similarity index 77% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractJobEntityQueryIT.java index fe12f79d1d..f07b11b5dd 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractJobEntityQueryIT.java @@ -16,22 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.query; +package org.kie.kogito.index.jpa.query; import org.kie.kogito.index.jpa.storage.JobEntityStorage; import org.kie.kogito.index.model.Job; import org.kie.kogito.index.test.query.AbstractJobQueryIT; import org.kie.kogito.persistence.api.Storage; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -@QuarkusTest -@QuarkusTestResource(OracleSqlQuarkusTestResource.class) -class JobEntityQueryIT extends AbstractJobQueryIT { +public abstract class AbstractJobEntityQueryIT extends AbstractJobQueryIT { @Inject JobEntityStorage storage; 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessDefinitionEntityQueryIT.java similarity index 77% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessDefinitionEntityQueryIT.java index f5ab610f09..0eab6d2d8f 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessDefinitionEntityQueryIT.java @@ -16,22 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.query; +package org.kie.kogito.index.jpa.query; import org.kie.kogito.index.jpa.storage.ProcessDefinitionEntityStorage; import org.kie.kogito.index.model.ProcessDefinition; import org.kie.kogito.index.test.query.AbstractProcessDefinitionQueryIT; import org.kie.kogito.persistence.api.Storage; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -@QuarkusTest -@QuarkusTestResource(OracleSqlQuarkusTestResource.class) -class ProcessDefinitionEntityQueryIT extends AbstractProcessDefinitionQueryIT { +public abstract class AbstractProcessDefinitionEntityQueryIT extends AbstractProcessDefinitionQueryIT { @Inject ProcessDefinitionEntityStorage storage; 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessInstanceEntityQueryIT.java similarity index 71% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessInstanceEntityQueryIT.java index 88e898e9c8..f2fc967907 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractProcessInstanceEntityQueryIT.java @@ -16,20 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.query; +package org.kie.kogito.index.jpa.query; import org.kie.kogito.index.jpa.storage.ProcessInstanceEntityStorage; import org.kie.kogito.index.test.query.AbstractProcessInstanceQueryIT; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -@QuarkusTest -@QuarkusTestResource(OracleSqlQuarkusTestResource.class) -class ProcessInstanceEntityQueryIT extends AbstractProcessInstanceQueryIT { +public abstract class AbstractProcessInstanceEntityQueryIT extends AbstractProcessInstanceQueryIT { @Inject ProcessInstanceEntityStorage storage; @@ -38,9 +32,4 @@ class ProcessInstanceEntityQueryIT extends AbstractProcessInstanceQueryIT { public ProcessInstanceEntityStorage getStorage() { return storage; } - - @Override - protected Boolean isDateTimeAsLong() { - return false; - } } 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractUserTaskInstanceEntityQueryIT.java similarity index 77% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractUserTaskInstanceEntityQueryIT.java index 522bd54ad2..347b2765c9 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/query/AbstractUserTaskInstanceEntityQueryIT.java @@ -16,20 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.query; +package org.kie.kogito.index.jpa.query; import org.kie.kogito.index.jpa.storage.UserTaskInstanceEntityStorage; import org.kie.kogito.index.test.query.AbstractUserTaskInstanceQueryIT; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -@QuarkusTest -@QuarkusTestResource(OracleSqlQuarkusTestResource.class) -class UserTaskInstanceEntityQueryIT extends AbstractUserTaskInstanceQueryIT { +public abstract class AbstractUserTaskInstanceEntityQueryIT extends AbstractUserTaskInstanceQueryIT { @Inject UserTaskInstanceEntityStorage storage; 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractJobStorageIT.java similarity index 85% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractJobStorageIT.java index a602ad8c45..75ea7aeb08 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractJobStorageIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.storage; +package org.kie.kogito.index.jpa.storage; import java.util.UUID; @@ -27,16 +27,10 @@ import org.kie.kogito.index.model.Job; import org.kie.kogito.index.test.TestUtils; import org.kie.kogito.persistence.api.StorageService; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -@QuarkusTest -@QuarkusTestResource(OracleSqlQuarkusTestResource.class) -public class JobStorageIT extends AbstractStorageIT { +public abstract class AbstractJobStorageIT extends AbstractStorageIT { @Inject JobEntityRepository repository; @@ -44,7 +38,7 @@ public class JobStorageIT extends AbstractStorageIT { @Inject StorageService storage; - public JobStorageIT() { + public AbstractJobStorageIT() { super(Job.class); } 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractProcessDefinitionStorageIT.java similarity index 79% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java rename to data-index/data-index-storage/data-index-storage-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractProcessDefinitionStorageIT.java index 7d915b5fed..5cbd6db8cc 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-jpa-common/src/test/java/org/kie/kogito/index/jpa/storage/AbstractProcessDefinitionStorageIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle.storage; +package org.kie.kogito.index.jpa.storage; import java.util.Set; @@ -24,20 +24,13 @@ import org.junit.jupiter.api.Test; import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity; import org.kie.kogito.index.jpa.model.ProcessDefinitionEntityRepository; -import org.kie.kogito.index.jpa.storage.ProcessDefinitionEntityStorage; import org.kie.kogito.index.model.ProcessDefinition; import org.kie.kogito.index.test.TestUtils; import org.kie.kogito.persistence.api.StorageService; -import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -@QuarkusTest -@QuarkusTestResource(OracleSqlQuarkusTestResource.class) -class ProcessDefinitionStorageIT extends AbstractStorageIT { +public abstract class AbstractProcessDefinitionStorageIT extends AbstractStorageIT { @Inject ProcessDefinitionEntityRepository repository; @@ -45,7 +38,7 @@ class ProcessDefinitionStorageIT extends AbstractStorageIT4.0.0 data-index-storage-jpa - Kogito Apps :: Data Index Storage JPA + Kogito Apps :: Data Index Storage JPA compatible DBs org.kie.kogito.index.jpa - + org.kie.kogito - data-index-storage-api + data-index-storage-jpa-common + + + io.quarkus + quarkus-test-h2 + test - org.kie.kogito - data-index-common + io.quarkus + quarkus-jdbc-h2 org.kie.kogito - persistence-commons-jpa + data-index-storage-api + test-jar + test + ${project.version} + + + org.kie.kogito + data-index-storage-jpa-common + test-jar + test + ${project.version} + + + io.quarkus + quarkus-junit5-mockito + test - org.mapstruct - mapstruct + org.assertj + assertj-core + test + + + org.mockito + mockito-junit-jupiter + test + + + org.kie.kogito + kogito-quarkus-test-utils + test - org.apache.maven.plugins - maven-compiler-plugin + maven-failsafe-plugin - - - org.mapstruct - mapstruct-processor - ${version.org.mapstruct} - - + + org.jboss.logmanager.LogManager + + + + test + + integration-test + verify + + + + + \ No newline at end of file diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/OracleStorageServiceProducer.java b/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc/JdbcStorageServiceProducer.java similarity index 95% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/OracleStorageServiceProducer.java rename to data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc/JdbcStorageServiceProducer.java index f14dde82e9..a5de13fbcf 100644 --- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/OracleStorageServiceProducer.java +++ b/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc/JdbcStorageServiceProducer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle; +package org.kie.kogito.index.jdbc; import org.kie.kogito.index.jpa.storage.JPAStorageService; import org.kie.kogito.index.jpa.storage.JobEntityStorage; @@ -34,12 +34,12 @@ import static org.kie.kogito.persistence.api.factory.Constants.PERSISTENCE_TYPE_PROPERTY; -public class OracleStorageServiceProducer { +public class JdbcStorageServiceProducer { @Produces @Alternative @Priority(1) @ApplicationScoped - @IfBuildProperty(name = PERSISTENCE_TYPE_PROPERTY, stringValue = "oracle") + @IfBuildProperty(name = PERSISTENCE_TYPE_PROPERTY, stringValue = "jdbc") StorageService PostgreSqlStorageService(final ProcessDefinitionEntityStorage definitionStorage, final ProcessInstanceEntityStorage processStorage, final JobEntityStorage jobStorage, diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/JsonBinaryConverter.java b/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc/JsonBinaryConverter.java similarity index 97% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/JsonBinaryConverter.java rename to data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc/JsonBinaryConverter.java index 5701e70dc0..586f60ed18 100644 --- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/JsonBinaryConverter.java +++ b/data-index/data-index-storage/data-index-storage-jpa/src/main/java/org/kie/kogito/index/jdbc/JsonBinaryConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.oracle; +package org.kie.kogito.index.jdbc; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/orm.xml b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/orm.xml similarity index 78% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/orm.xml rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/orm.xml index ff5279f699..2e9789c752 100644 --- a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/orm.xml +++ b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/orm.xml @@ -7,7 +7,7 @@ - + @@ -15,11 +15,11 @@ - + - + @@ -27,7 +27,7 @@ - + diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.33.0__data_index_create.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.33.0__data_index_create.sql similarity index 100% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.33.0__data_index_create.sql rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.33.0__data_index_create.sql diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql similarity index 100% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql similarity index 100% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql similarity index 100% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql similarity index 100% rename from data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/JobEntityMapperIT.java similarity index 75% rename from data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java rename to data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/JobEntityMapperIT.java index ee54c4274a..5d85af3fcd 100644 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/JobEntityMapperIT.java @@ -16,15 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.service.messaging; +package org.kie.kogito.index.jdbc.mapper; -import org.kie.kogito.index.service.test.KafkaMessageTestProfile; +import org.kie.kogito.index.jpa.mapper.AbstractJobEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.TestProfile; @QuarkusTest -@TestProfile(KafkaMessageTestProfile.class) -class OracleMessagingKafkaConsumerIT extends AbstractMessagingKafkaConsumerIT { - +class JobEntityMapperIT extends AbstractJobEntityMapperIT { } diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessDefinitionEntityMapperIT.java similarity index 75% rename from data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java rename to data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessDefinitionEntityMapperIT.java index 1a255cf16d..f2ea4d334b 100644 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessDefinitionEntityMapperIT.java @@ -16,15 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.service.messaging; +package org.kie.kogito.index.jdbc.mapper; -import org.kie.kogito.index.service.test.InMemoryMessageTestProfile; +import org.kie.kogito.index.jpa.mapper.AbstractProcessDefinitionEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.TestProfile; @QuarkusTest -@TestProfile(InMemoryMessageTestProfile.class) -class OracleMessagingHttpConsumerIT extends AbstractMessagingHttpConsumerIT { - +class ProcessDefinitionEntityMapperIT extends AbstractProcessDefinitionEntityMapperIT { } diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessInstanceEntityMapperIT.java similarity index 76% rename from data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java rename to data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessInstanceEntityMapperIT.java index 436ba483ca..5c3230ddbe 100644 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/ProcessInstanceEntityMapperIT.java @@ -16,15 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.service; +package org.kie.kogito.index.jdbc.mapper; -import org.kie.kogito.index.service.test.InMemoryMessageTestProfile; +import org.kie.kogito.index.jpa.mapper.AbstractProcessInstanceEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.TestProfile; @QuarkusTest -@TestProfile(InMemoryMessageTestProfile.class) -class OracleIndexingServiceIT extends AbstractIndexingServiceIT { +class ProcessInstanceEntityMapperIT extends AbstractProcessInstanceEntityMapperIT { } diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/UserTaskInstanceEntityMapperIT.java similarity index 75% rename from data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java rename to data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/UserTaskInstanceEntityMapperIT.java index d5b17e14b8..64131ffe24 100644 --- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/mapper/UserTaskInstanceEntityMapperIT.java @@ -16,15 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.index.service; +package org.kie.kogito.index.jdbc.mapper; -import org.kie.kogito.index.service.test.KeycloakTestProfile; +import org.kie.kogito.index.jpa.mapper.AbstractUserTaskInstanceEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.TestProfile; @QuarkusTest -@TestProfile(KeycloakTestProfile.class) -class KeycloakOracleIndexingServiceIT extends AbstractKeycloakIntegrationIndexingServiceIT { +class UserTaskInstanceEntityMapperIT extends AbstractUserTaskInstanceEntityMapperIT { } diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/JobEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/JobEntityQueryIT.java new file mode 100644 index 0000000000..a99c7eeabd --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/JobEntityQueryIT.java @@ -0,0 +1,31 @@ +/* + * 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.jdbc.query; + +import org.kie.kogito.index.jpa.query.AbstractJobEntityQueryIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +class JobEntityQueryIT extends AbstractJobEntityQueryIT { + +} diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessDefinitionEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessDefinitionEntityQueryIT.java new file mode 100644 index 0000000000..c99803b83a --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessDefinitionEntityQueryIT.java @@ -0,0 +1,31 @@ +/* + * 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.jdbc.query; + +import org.kie.kogito.index.jpa.query.AbstractProcessDefinitionEntityQueryIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +class ProcessDefinitionEntityQueryIT extends AbstractProcessDefinitionEntityQueryIT { + +} diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessInstanceEntityQueryIT.java new file mode 100644 index 0000000000..10bd679b53 --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/ProcessInstanceEntityQueryIT.java @@ -0,0 +1,35 @@ +/* + * 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.jdbc.query; + +import org.kie.kogito.index.jpa.query.AbstractProcessInstanceEntityQueryIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +class ProcessInstanceEntityQueryIT extends AbstractProcessInstanceEntityQueryIT { + + @Override + protected Boolean isDateTimeAsLong() { + return false; + } +} diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/UserTaskInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/UserTaskInstanceEntityQueryIT.java new file mode 100644 index 0000000000..abaffc8741 --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/UserTaskInstanceEntityQueryIT.java @@ -0,0 +1,31 @@ +/* + * 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.jdbc.query; + +import org.kie.kogito.index.jpa.query.AbstractUserTaskInstanceEntityQueryIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +class UserTaskInstanceEntityQueryIT extends AbstractUserTaskInstanceEntityQueryIT { + +} diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/JobStorageIT.java new file mode 100644 index 0000000000..88c5db0fbb --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/JobStorageIT.java @@ -0,0 +1,31 @@ +/* + * 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.jdbc.storage; + +import org.kie.kogito.index.jpa.storage.AbstractJobStorageIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +public class JobStorageIT extends AbstractJobStorageIT { + +} diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessDefinitionStorageIT.java new file mode 100644 index 0000000000..b0369d8369 --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessDefinitionStorageIT.java @@ -0,0 +1,31 @@ +/* + * 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.jdbc.storage; + +import org.kie.kogito.index.jpa.storage.AbstractProcessDefinitionStorageIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +class ProcessDefinitionStorageIT extends AbstractProcessDefinitionStorageIT { + +} diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessInstanceStorageIT.java new file mode 100644 index 0000000000..9f40d50928 --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/ProcessInstanceStorageIT.java @@ -0,0 +1,30 @@ +/* + * 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.jdbc.storage; + +import org.kie.kogito.index.jpa.storage.AbstractProcessInstanceStorageIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +public class ProcessInstanceStorageIT extends AbstractProcessInstanceStorageIT { +} diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/UserTaskInstanceStorageIT.java new file mode 100644 index 0000000000..4a6b9921e5 --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/UserTaskInstanceStorageIT.java @@ -0,0 +1,30 @@ +/* + * 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.jdbc.storage; + +import org.kie.kogito.index.jpa.storage.AbstractUserTaskInstanceStorageIT; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(H2DatabaseTestResource.class) +public class UserTaskInstanceStorageIT extends AbstractUserTaskInstanceStorageIT { +} diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/resources/application.properties b/data-index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties similarity index 84% rename from data-index/data-index-storage/data-index-storage-oracle/src/test/resources/application.properties rename to data-index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties index 6dbb374445..5cf2dfb3a2 100644 --- a/data-index/data-index-storage/data-index-storage-oracle/src/test/resources/application.properties +++ b/data-index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties @@ -18,12 +18,10 @@ # # Kogito -kogito.apps.persistence.type=oracle +kogito.apps.persistence.type=jdbc # Data source -quarkus.datasource.db-kind=oracle -quarkus.datasource.username=kogito -quarkus.datasource.password=kogito -quarkus.datasource.jdbc.url=jdbc:oracle://localhost:1521/kogito +quarkus.datasource.db-kind=h2 +quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test;NON_KEYWORDS=VALUE,KEY # Hibernate quarkus.hibernate-orm.database.generation=create quarkus.hibernate-orm.database.generation.halt-on-error=true diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml deleted file mode 100644 index a0eb9fbf8c..0000000000 --- a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml +++ /dev/null @@ -1,20 +0,0 @@ - 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 deleted file mode 100644 index 6e2c2dfde5..0000000000 --- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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.oracle.schema; - -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; - -import org.hibernate.boot.Metadata; -import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.cfg.Environment; -import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.hibernate.tool.schema.TargetType; -import org.kie.kogito.index.jpa.model.AttachmentEntity; -import org.kie.kogito.index.jpa.model.CommentEntity; -import org.kie.kogito.index.jpa.model.JobEntity; -import org.kie.kogito.index.jpa.model.MilestoneEntity; -import org.kie.kogito.index.jpa.model.NodeEntity; -import org.kie.kogito.index.jpa.model.NodeInstanceEntity; -import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity; -import org.kie.kogito.index.jpa.model.ProcessInstanceEntity; -import org.kie.kogito.index.jpa.model.ProcessInstanceErrorEntity; -import org.kie.kogito.index.jpa.model.UserTaskInstanceEntity; -import org.kie.kogito.testcontainers.KogitoOracleSqlContainer; - -public class DDLSchemaExporter { - - public static void main(String[] args) { - try (KogitoOracleSqlContainer oracleSql = new KogitoOracleSqlContainer()) { - oracleSql.start(); - Map settings = new HashMap<>(); - settings.put(Environment.URL, oracleSql.getJdbcUrl()); - settings.put(Environment.USER, oracleSql.getUsername()); - settings.put(Environment.PASS, oracleSql.getPassword()); - settings.put(Environment.PHYSICAL_NAMING_STRATEGY, "org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy"); - - StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(settings).build(); - - MetadataSources metadataSources = new MetadataSources(serviceRegistry); - metadataSources.addAnnotatedClass(NodeEntity.class); - metadataSources.addAnnotatedClass(ProcessDefinitionEntity.class); - metadataSources.addAnnotatedClass(JobEntity.class); - metadataSources.addAnnotatedClass(MilestoneEntity.class); - metadataSources.addAnnotatedClass(NodeInstanceEntity.class); - metadataSources.addAnnotatedClass(ProcessInstanceEntity.class); - metadataSources.addAnnotatedClass(ProcessInstanceErrorEntity.class); - metadataSources.addAnnotatedClass(AttachmentEntity.class); - metadataSources.addAnnotatedClass(CommentEntity.class); - metadataSources.addAnnotatedClass(UserTaskInstanceEntity.class); - Metadata metadata = metadataSources.buildMetadata(); - - SchemaExport schemaExport = new SchemaExport(); - schemaExport.setDelimiter(";"); - schemaExport.setFormat(true); - schemaExport.setOverrideOutputFileContent(); - schemaExport.setOutputFile("src/main/resources/data_index_create.sql"); - schemaExport.createOnly(EnumSet.of(TargetType.SCRIPT), metadata); - schemaExport.getExceptions().forEach(System.err::println); - } catch (Exception ex) { - ex.printStackTrace(); - } - } -} diff --git a/data-index/data-index-storage/data-index-storage-postgresql/pom.xml b/data-index/data-index-storage/data-index-storage-postgresql/pom.xml index 75ab6b6b4c..dc2fca03e5 100644 --- a/data-index/data-index-storage/data-index-storage-postgresql/pom.xml +++ b/data-index/data-index-storage/data-index-storage-postgresql/pom.xml @@ -39,7 +39,7 @@ org.kie.kogito - data-index-storage-jpa + data-index-storage-jpa-common org.kie.kogito @@ -51,6 +51,13 @@ test-jar test + + org.kie.kogito + data-index-storage-jpa-common + test-jar + test + ${project.version} + io.quarkus quarkus-junit5-mockito 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 8b18c82c38..42a74c5b9b 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 @@ -18,89 +18,10 @@ */ package org.kie.kogito.index.postgresql.mapper; -import java.time.ZonedDateTime; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.JobEntityMapper; -import org.kie.kogito.index.jpa.model.JobEntity; -import org.kie.kogito.index.model.Job; +import org.kie.kogito.index.jpa.mapper.AbstractJobEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - -import static org.assertj.core.api.Assertions.assertThat; - @QuarkusTest -class JobEntityMapperIT { - - @Inject - JobEntityMapper mapper; - - Job job = new Job(); - - JobEntity jobEntity = new JobEntity(); - - @BeforeEach - void setup() { - String testId = "testId"; - ZonedDateTime time = ZonedDateTime.now(); - String status = "ACTIVE"; - String processId = "testProcessId"; - String processInstanceId = "testProcessInstanceId"; - String rootProcessId = "testRootProcessId"; - String rootProcessInstanceId = "testRootProcessInstanceId"; - Integer priority = 79; - String callbackEndpoint = "testCallbackEndpoint"; - Long repeatInterval = 70L; - Integer repeatLimit = 89; - String scheduledId = "testScheduleId"; - Integer retries = 25; - Integer executionCounter = 17; - - job.setId(testId); - job.setStatus(status); - job.setLastUpdate(time); - job.setProcessId(processId); - job.setProcessInstanceId(processInstanceId); - job.setRootProcessId(rootProcessId); - job.setRootProcessInstanceId(rootProcessInstanceId); - job.setExpirationTime(time); - job.setPriority(priority); - job.setCallbackEndpoint(callbackEndpoint); - job.setRepeatInterval(repeatInterval); - job.setRepeatLimit(repeatLimit); - job.setScheduledId(scheduledId); - job.setRetries(retries); - job.setExecutionCounter(executionCounter); - - jobEntity.setId(testId); - jobEntity.setStatus(status); - jobEntity.setLastUpdate(time); - jobEntity.setProcessId(processId); - jobEntity.setProcessInstanceId(processInstanceId); - jobEntity.setRootProcessId(rootProcessId); - jobEntity.setRootProcessInstanceId(rootProcessInstanceId); - jobEntity.setExpirationTime(time); - jobEntity.setPriority(priority); - jobEntity.setCallbackEndpoint(callbackEndpoint); - jobEntity.setRepeatInterval(repeatInterval); - jobEntity.setRepeatLimit(repeatLimit); - jobEntity.setScheduledId(scheduledId); - jobEntity.setRetries(retries); - jobEntity.setExecutionCounter(executionCounter); - } - - @Test - void testMapToEntity() { - JobEntity result = mapper.mapToEntity(job); - assertThat(result).isEqualToIgnoringGivenFields(jobEntity, "$$_hibernate_tracker"); - } - - @Test - void testMapToModel() { - Job result = mapper.mapToModel(jobEntity); - assertThat(result).isEqualToComparingFieldByField(job); - } +class JobEntityMapperIT extends AbstractJobEntityMapperIT { } 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 35634f9713..eb7cef3d14 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 @@ -18,88 +18,10 @@ */ package org.kie.kogito.index.postgresql.mapper; -import java.util.Set; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.ProcessDefinitionEntityMapper; -import org.kie.kogito.index.jpa.model.NodeEntity; -import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity; -import org.kie.kogito.index.model.Node; -import org.kie.kogito.index.model.ProcessDefinition; +import org.kie.kogito.index.jpa.mapper.AbstractProcessDefinitionEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static java.util.Collections.singletonMap; -import static org.assertj.core.api.Assertions.assertThat; - @QuarkusTest -class ProcessDefinitionEntityMapperIT { - - ProcessDefinition pd = new ProcessDefinition(); - ProcessDefinitionEntity entity = new ProcessDefinitionEntity(); - - @Inject - ProcessDefinitionEntityMapper mapper; - - @BeforeEach - void setup() { - String version = "1.0"; - String processId = "testProcessId"; - Set roles = singleton("testRoles"); - String type = "testType"; - Set addons = singleton("testAddons"); - - String nodeId = "testNodeId"; - String nodeName = "testNodeName"; - String nodeUniqueId = "testNodeUniqueId"; - String nodeMetadataUniqueId = "testMetadataUniqueId"; - String nodeType = "testNodeType"; - - Node node = new Node(); - node.setId(nodeId); - node.setName(nodeName); - node.setType(nodeType); - node.setUniqueId(nodeUniqueId); - node.setMetadata(singletonMap("UniqueId", nodeMetadataUniqueId)); - - pd.setId(processId); - pd.setVersion(version); - pd.setRoles(roles); - pd.setAddons(addons); - pd.setType(type); - pd.setNodes(singletonList(node)); - - NodeEntity nodeEntity = new NodeEntity(); - nodeEntity.setId(nodeId); - nodeEntity.setName(nodeName); - nodeEntity.setType(nodeType); - nodeEntity.setUniqueId(nodeUniqueId); - nodeEntity.setMetadata(singletonMap("UniqueId", nodeMetadataUniqueId)); - nodeEntity.setProcessDefinition(entity); - - entity.setId(processId); - entity.setVersion(version); - entity.setRoles(roles); - entity.setAddons(addons); - entity.setType(type); - entity.setNodes(singletonList(nodeEntity)); - } - - @Test - void testMapToEntity() { - ProcessDefinitionEntity result = mapper.mapToEntity(pd); - assertThat(result).usingRecursiveComparison().ignoringFieldsMatchingRegexes(".*\\$\\$_hibernate_tracker").isEqualTo(entity); - } - - @Test - void testMapToModel() { - ProcessDefinition result = mapper.mapToModel(entity); - assertThat(result).usingRecursiveComparison().isEqualTo(pd); - } - +class ProcessDefinitionEntityMapperIT extends AbstractProcessDefinitionEntityMapperIT { } 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 ea0b9fdba8..949bd0c010 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 @@ -18,169 +18,10 @@ */ package org.kie.kogito.index.postgresql.mapper; -import java.time.ZonedDateTime; -import java.util.Set; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.ProcessInstanceEntityMapper; -import org.kie.kogito.index.jpa.model.MilestoneEntity; -import org.kie.kogito.index.jpa.model.MilestoneEntityId; -import org.kie.kogito.index.jpa.model.NodeInstanceEntity; -import org.kie.kogito.index.jpa.model.ProcessInstanceEntity; -import org.kie.kogito.index.jpa.model.ProcessInstanceErrorEntity; -import org.kie.kogito.index.model.Milestone; -import org.kie.kogito.index.model.NodeInstance; -import org.kie.kogito.index.model.ProcessInstance; -import org.kie.kogito.index.model.ProcessInstanceError; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import org.kie.kogito.index.jpa.mapper.AbstractProcessInstanceEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static org.assertj.core.api.Assertions.assertThat; - @QuarkusTest -class ProcessInstanceEntityMapperIT { - - ObjectMapper jsonMapper = new ObjectMapper(); - ProcessInstance processInstance = new ProcessInstance(); - ProcessInstanceEntity processInstanceEntity = new ProcessInstanceEntity(); - - @Inject - ProcessInstanceEntityMapper mapper; - - @BeforeEach - void setup() { - String nodeInstanceId = "testNodeInstanceId"; - String nodeInstanceName = "testNodeInstanceName"; - String nodeInstanceNodeId = "testNodeInstanceNodeId"; - String nodeInstanceType = "testNodeInstanceType"; - String nodeInstanceDefinitionId = "testNodeInstanceDefinitionId"; - - String processInstanceErrorMessage = "testProcessInstanceErrorMessage"; - String processInstanceErrorNodeDefinitionId = "testProcessInstanceErrorNodeDefinitionId"; - - String milestoneId = "testMilestone"; - String milestoneName = "testMilestoneName"; - String milestoneStatus = "testMilestoneStatus"; - - String testId = "testId"; - String processId = "testProcessId"; - Set roles = singleton("testRoles"); - ObjectNode variables = jsonMapper.createObjectNode(); - variables.put("test", "testValue"); - String endpoint = "testEndpoint"; - Integer state = 2; - ZonedDateTime time = ZonedDateTime.now(); - String rootProcessId = "testRootProcessId"; - String rootProcessInstanceId = "testRootProcessInstanceId"; - String parentProcessInstanceId = "testParentProcessInstanceId"; - String processName = "testProcessName"; - Set addons = singleton("testAddons"); - String businessKey = "testBusinessKey"; - String createdBy = "initiatorUser"; - String updatedBy = "currentUser"; - - NodeInstance nodeInstance = new NodeInstance(); - nodeInstance.setId(nodeInstanceId); - nodeInstance.setDefinitionId(nodeInstanceDefinitionId); - nodeInstance.setExit(time); - nodeInstance.setEnter(time); - nodeInstance.setType(nodeInstanceType); - nodeInstance.setNodeId(nodeInstanceNodeId); - nodeInstance.setName(nodeInstanceName); - - ProcessInstanceError processInstanceError = new ProcessInstanceError(); - processInstanceError.setMessage(processInstanceErrorMessage); - processInstanceError.setNodeDefinitionId(processInstanceErrorNodeDefinitionId); - - Milestone milestone = new Milestone(); - milestone.setId(milestoneId); - milestone.setName(milestoneName); - milestone.setStatus(milestoneStatus); - - processInstance.setId(testId); - processInstance.setProcessId(processId); - processInstance.setRoles(roles); - processInstance.setVariables(variables); - processInstance.setEndpoint(endpoint); - processInstance.setNodes(singletonList(nodeInstance)); - processInstance.setState(state); - processInstance.setStart(time); - processInstance.setEnd(time); - processInstance.setRootProcessId(rootProcessId); - processInstance.setRootProcessInstanceId(rootProcessInstanceId); - processInstance.setParentProcessInstanceId(parentProcessInstanceId); - processInstance.setProcessName(processName); - processInstance.setError(processInstanceError); - processInstance.setAddons(addons); - processInstance.setLastUpdate(time); - processInstance.setBusinessKey(businessKey); - processInstance.setMilestones(singletonList(milestone)); - processInstance.setCreatedBy(createdBy); - processInstance.setUpdatedBy(updatedBy); - - NodeInstanceEntity nodeInstanceEntity = new NodeInstanceEntity(); - nodeInstanceEntity.setId(nodeInstanceId); - nodeInstanceEntity.setDefinitionId(nodeInstanceDefinitionId); - nodeInstanceEntity.setEnter(time); - nodeInstanceEntity.setExit(time); - nodeInstanceEntity.setName(nodeInstanceName); - nodeInstanceEntity.setNodeId(nodeInstanceNodeId); - nodeInstanceEntity.setType(nodeInstanceType); - nodeInstanceEntity.setProcessInstance(processInstanceEntity); - - ProcessInstanceErrorEntity processInstanceErrorEntity = new ProcessInstanceErrorEntity(); - processInstanceErrorEntity.setMessage(processInstanceErrorMessage); - processInstanceErrorEntity.setNodeDefinitionId(processInstanceErrorNodeDefinitionId); - - MilestoneEntity milestoneEntity = new MilestoneEntity(); - MilestoneEntityId milestoneEntityId = new MilestoneEntityId(); - milestoneEntityId.setId(milestoneId); - milestoneEntityId.setProcessInstance(testId); - milestoneEntity.setId(milestoneId); - milestoneEntity.setName(milestoneName); - milestoneEntity.setStatus(milestoneStatus); - milestoneEntity.setProcessInstance(processInstanceEntity); - - processInstanceEntity.setId(testId); - processInstanceEntity.setProcessId(processId); - processInstanceEntity.setRoles(roles); - processInstanceEntity.setVariables(variables); - processInstanceEntity.setEndpoint(endpoint); - processInstanceEntity.setNodes(singletonList(nodeInstanceEntity)); - processInstanceEntity.setState(state); - processInstanceEntity.setStart(time); - processInstanceEntity.setEnd(time); - processInstanceEntity.setRootProcessId(rootProcessId); - processInstanceEntity.setRootProcessInstanceId(rootProcessInstanceId); - processInstanceEntity.setParentProcessInstanceId(parentProcessInstanceId); - processInstanceEntity.setProcessName(processName); - processInstanceEntity.setError(processInstanceErrorEntity); - processInstanceEntity.setAddons(addons); - processInstanceEntity.setLastUpdate(time); - processInstanceEntity.setBusinessKey(businessKey); - processInstanceEntity.setMilestones(singletonList(milestoneEntity)); - processInstanceEntity.setCreatedBy(createdBy); - processInstanceEntity.setUpdatedBy(updatedBy); - } - - @Test - void testMapToEntity() { - ProcessInstanceEntity result = mapper.mapToEntity(processInstance); - assertThat(result).usingRecursiveComparison().ignoringFieldsMatchingRegexes(".*\\$\\$_hibernate_tracker").isEqualTo(processInstanceEntity); - } - - @Test - void testMapToModel() { - ProcessInstance result = mapper.mapToModel(processInstanceEntity); - assertThat(result).usingRecursiveComparison().isEqualTo(processInstance); - } - +class ProcessInstanceEntityMapperIT extends AbstractProcessInstanceEntityMapperIT { } 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 39574a8020..65a1ef1a6c 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 @@ -18,151 +18,10 @@ */ package org.kie.kogito.index.postgresql.mapper; -import java.time.ZonedDateTime; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.mapper.UserTaskInstanceEntityMapper; -import org.kie.kogito.index.jpa.model.AttachmentEntity; -import org.kie.kogito.index.jpa.model.CommentEntity; -import org.kie.kogito.index.jpa.model.UserTaskInstanceEntity; -import org.kie.kogito.index.model.Attachment; -import org.kie.kogito.index.model.Comment; -import org.kie.kogito.index.model.UserTaskInstance; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import org.kie.kogito.index.jpa.mapper.AbstractUserTaskInstanceEntityMapperIT; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - -import static java.util.Collections.singleton; -import static java.util.Collections.singletonList; -import static org.assertj.core.api.Assertions.assertThat; - @QuarkusTest -class UserTaskInstanceEntityMapperIT { - - UserTaskInstance userTaskInstance = new UserTaskInstance(); - UserTaskInstanceEntity userTaskInstanceEntity = new UserTaskInstanceEntity(); - - @Inject - ObjectMapper jsonMapper; - - @Inject - UserTaskInstanceEntityMapper mapper; - - @BeforeEach - void setup() { - String testId = "testId"; - String description = "testDescription"; - String name = "testName"; - String priority = "10"; - String processInstanceId = "testProcessInstanceId"; - String state = "testState"; - String actualOwner = "testActualOwner"; - Set adminGroups = singleton("testAdminGroups"); - Set adminUsers = singleton("testAdminUsers"); - ZonedDateTime time = ZonedDateTime.now(); - Set excludedUsers = singleton("testExcludedUsers"); - Set potentialGroups = singleton("testPotentialGroups"); - Set potentialUsers = singleton("testPotentialUsers"); - String referenceName = "testReferenceName"; - String processId = "testProcessId"; - String rootProcessId = "testRootProcessId"; - String rootProcessInstanceId = "testRootProcessInstanceId"; - Map object = new HashMap<>(); - object.put("test", "testValue"); - ObjectNode inputs = jsonMapper.createObjectNode().put("testInput", "testValue"); - ObjectNode outputs = jsonMapper.createObjectNode().put("testOutput", "testValue"); - - String commentId = "testCommentId"; - String comment_content = "testCommentContent"; - String comment_updatedBy = "testCommentUpdatedBy"; - Comment comment = Comment.builder().id(commentId).updatedAt(time).updatedBy(comment_updatedBy).content(comment_content).build(); - CommentEntity commentEntity = new CommentEntity(); - commentEntity.setId(commentId); - commentEntity.setContent(comment_content); - commentEntity.setUpdatedAt(time); - commentEntity.setUpdatedBy(comment_updatedBy); - commentEntity.setUserTask(userTaskInstanceEntity); - - String attachmentId = "testAttachmentId"; - String attachment_name = "testAttachmentName"; - String attachment_content = "testAttachmentContent"; - String attachment_updatedBy = "testAttachmentUpdatedBy"; - Attachment attachment = Attachment.builder().id(attachmentId).updatedAt(time).updatedBy(attachment_updatedBy) - .content(attachment_content).name(attachment_name).build(); - AttachmentEntity attachmentEntity = new AttachmentEntity(); - attachmentEntity.setId(attachmentId); - attachmentEntity.setContent(attachment_content); - attachmentEntity.setName(attachment_name); - attachmentEntity.setUpdatedAt(time); - attachmentEntity.setUpdatedBy(attachment_updatedBy); - attachmentEntity.setUserTask(userTaskInstanceEntity); - - userTaskInstance.setId(testId); - userTaskInstance.setDescription(description); - userTaskInstance.setName(name); - userTaskInstance.setPriority(priority); - userTaskInstance.setProcessInstanceId(processInstanceId); - userTaskInstance.setState(state); - userTaskInstance.setActualOwner(actualOwner); - userTaskInstance.setAdminGroups(adminGroups); - userTaskInstance.setAdminUsers(adminUsers); - userTaskInstance.setCompleted(time); - userTaskInstance.setStarted(time); - userTaskInstance.setExcludedUsers(excludedUsers); - userTaskInstance.setPotentialGroups(potentialGroups); - userTaskInstance.setPotentialUsers(potentialUsers); - userTaskInstance.setReferenceName(referenceName); - userTaskInstance.setLastUpdate(time); - userTaskInstance.setProcessId(processId); - userTaskInstance.setRootProcessId(rootProcessId); - userTaskInstance.setRootProcessInstanceId(rootProcessInstanceId); - userTaskInstance.setInputs(inputs); - userTaskInstance.setOutputs(outputs); - userTaskInstance.setComments(singletonList(comment)); - userTaskInstance.setAttachments(singletonList(attachment)); - - userTaskInstanceEntity.setId(testId); - userTaskInstanceEntity.setDescription(description); - userTaskInstanceEntity.setName(name); - userTaskInstanceEntity.setPriority(priority); - userTaskInstanceEntity.setProcessInstanceId(processInstanceId); - userTaskInstanceEntity.setState(state); - userTaskInstanceEntity.setActualOwner(actualOwner); - userTaskInstanceEntity.setAdminGroups(adminGroups); - userTaskInstanceEntity.setAdminUsers(adminUsers); - userTaskInstanceEntity.setCompleted(time); - userTaskInstanceEntity.setStarted(time); - userTaskInstanceEntity.setExcludedUsers(excludedUsers); - userTaskInstanceEntity.setPotentialGroups(potentialGroups); - userTaskInstanceEntity.setPotentialUsers(potentialUsers); - userTaskInstanceEntity.setReferenceName(referenceName); - userTaskInstanceEntity.setLastUpdate(time); - userTaskInstanceEntity.setProcessId(processId); - userTaskInstanceEntity.setRootProcessId(rootProcessId); - userTaskInstanceEntity.setRootProcessInstanceId(rootProcessInstanceId); - userTaskInstanceEntity.setInputs(inputs); - userTaskInstanceEntity.setOutputs(outputs); - userTaskInstanceEntity.setComments(singletonList(commentEntity)); - userTaskInstanceEntity.setAttachments(singletonList(attachmentEntity)); - } - - @Test - void testMapToEntity() { - UserTaskInstanceEntity result = mapper.mapToEntity(userTaskInstance); - assertThat(result).isEqualToIgnoringGivenFields(userTaskInstanceEntity, "$$_hibernate_tracker"); - } - - @Test - void testMapToModel() { - UserTaskInstance result = mapper.mapToModel(userTaskInstanceEntity); - assertThat(result).isEqualToComparingFieldByField(userTaskInstance); - } +class UserTaskInstanceEntityMapperIT extends AbstractUserTaskInstanceEntityMapperIT { } 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 b97a783fbf..90502e9075 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,27 +18,13 @@ */ package org.kie.kogito.index.postgresql.query; -import org.kie.kogito.index.jpa.storage.JobEntityStorage; -import org.kie.kogito.index.model.Job; -import org.kie.kogito.index.test.query.AbstractJobQueryIT; -import org.kie.kogito.persistence.api.Storage; +import org.kie.kogito.index.jpa.query.AbstractJobEntityQueryIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -class JobEntityQueryIT extends AbstractJobQueryIT { - - @Inject - JobEntityStorage storage; - - @Override - public Storage getStorage() { - return storage; - } - +class JobEntityQueryIT extends AbstractJobEntityQueryIT { } 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 28384df31a..0f304623be 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,31 +18,13 @@ */ package org.kie.kogito.index.postgresql.query; -import org.kie.kogito.index.jpa.storage.ProcessDefinitionEntityStorage; -import org.kie.kogito.index.model.ProcessDefinition; -import org.kie.kogito.index.test.query.AbstractProcessDefinitionQueryIT; -import org.kie.kogito.persistence.api.Storage; +import org.kie.kogito.index.jpa.query.AbstractProcessDefinitionEntityQueryIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -class ProcessDefinitionEntityQueryIT extends AbstractProcessDefinitionQueryIT { - - @Inject - ProcessDefinitionEntityStorage storage; - - @Override - public Storage getStorage() { - return storage; - } - - @Override - protected Boolean isDateTimeAsLong() { - return false; - } +class ProcessDefinitionEntityQueryIT extends AbstractProcessDefinitionEntityQueryIT { } 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 5e963cee98..254bca48f2 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,30 +18,13 @@ */ package org.kie.kogito.index.postgresql.query; -import org.kie.kogito.index.jpa.storage.ProcessInstanceEntityStorage; -import org.kie.kogito.index.storage.ProcessInstanceStorage; -import org.kie.kogito.index.test.query.AbstractProcessInstanceQueryIT; +import org.kie.kogito.index.jpa.query.AbstractProcessInstanceEntityQueryIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -class ProcessInstanceEntityQueryIT extends AbstractProcessInstanceQueryIT { - - @Inject - ProcessInstanceEntityStorage storage; - - @Override - public ProcessInstanceStorage getStorage() { - return storage; - } - - @Override - protected Boolean isDateTimeAsLong() { - return false; - } +class ProcessInstanceEntityQueryIT extends AbstractProcessInstanceEntityQueryIT { } 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 f0e2a6fc9b..399e5ecf2d 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,30 +18,14 @@ */ package org.kie.kogito.index.postgresql.query; -import org.kie.kogito.index.jpa.storage.UserTaskInstanceEntityStorage; -import org.kie.kogito.index.storage.UserTaskInstanceStorage; -import org.kie.kogito.index.test.query.AbstractUserTaskInstanceQueryIT; +import org.kie.kogito.index.jpa.query.AbstractUserTaskInstanceEntityQueryIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -class UserTaskInstanceEntityQueryIT extends AbstractUserTaskInstanceQueryIT { - - @Inject - UserTaskInstanceEntityStorage storage; - - @Override - public UserTaskInstanceStorage getStorage() { - return storage; - } +class UserTaskInstanceEntityQueryIT extends AbstractUserTaskInstanceEntityQueryIT { - @Override - protected Boolean isDateTimeAsLong() { - return false; - } } diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java deleted file mode 100644 index 427e8d3d2a..0000000000 --- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.postgresql.storage; - -import org.kie.kogito.index.jpa.model.AbstractEntity; -import org.kie.kogito.persistence.api.Storage; -import org.kie.kogito.persistence.api.StorageService; - -import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; - -import static org.assertj.core.api.Assertions.assertThat; - -public abstract class AbstractStorageIT { - - Class type; - - public AbstractStorageIT(Class type) { - this.type = type; - } - - abstract StorageService getStorage(); - - abstract PanacheRepositoryBase getRepository(); - - void testStorage(String key, T value1, T value2) { - Storage cache = getStorage().getCache("cache", type); - assertThat(cache.get(key)).isNull(); - assertThat(cache.containsKey(key)).isFalse(); - - cache.put(key, value1); - assertThat(cache.get(key)).isEqualTo(value1); - assertThat(cache.containsKey(key)).isTrue(); - - cache.put(key, value2); - assertThat(cache.get(key)).isEqualTo(value2); - assertThat(cache.containsKey(key)).isTrue(); - - cache.remove(key); - assertThat(cache.get(key)).isNull(); - assertThat(cache.containsKey(key)).isFalse(); - } - -} 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 deleted file mode 100644 index 20d85db1b1..0000000000 --- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * 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.postgresql.storage; - -import java.util.List; -import java.util.function.Function; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.kie.kogito.index.jpa.model.ProcessInstanceEntity; -import org.kie.kogito.index.jpa.storage.JPAQuery; -import org.kie.kogito.index.model.ProcessInstance; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; - -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 static java.util.Arrays.asList; -import static java.util.Collections.emptyList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.kie.kogito.persistence.api.query.QueryFilterFactory.orderBy; -import static org.kie.kogito.persistence.api.query.SortDirection.ASC; -import static org.kie.kogito.persistence.api.query.SortDirection.DESC; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -@ExtendWith(MockitoExtension.class) -class DomainQueryTest { - - private static final Class rootType = ProcessInstanceEntity.class; - - @Mock - PanacheRepositoryBase repository; - - @Mock - EntityManager entityManager; - - @Mock - CriteriaBuilder criteriaBuilder; - - @Mock - CriteriaQuery criteriaQuery; - - @Mock - TypedQuery mockQuery; - - @BeforeEach - public void setup() { - when(repository.getEntityManager()).thenReturn(entityManager); - when(entityManager.getCriteriaBuilder()).thenReturn(criteriaBuilder); - when(criteriaBuilder.createQuery(rootType)).thenReturn(criteriaQuery); - when(entityManager.createQuery(criteriaQuery)).thenReturn(mockQuery); - } - - @Test - void testNoParameters() { - JPAQuery query = new JPAQuery(repository, Function.identity(), rootType); - - query.execute(); - - verify(criteriaQuery).from(rootType); - verify(criteriaQuery, never()).where(any(Predicate.class)); - verify(criteriaQuery, never()).orderBy(any(List.class)); - verify(entityManager).createQuery(criteriaQuery); - verify(mockQuery).getResultList(); - } - - @Test - void testEmptyParameters() { - JPAQuery query = new JPAQuery(repository, Function.identity(), rootType); - query.filter(emptyList()); - query.sort(emptyList()); - - query.execute(); - - verify(criteriaQuery).from(rootType); - verify(criteriaQuery, never()).where(any(Predicate.class)); - verify(criteriaQuery, never()).orderBy(any(List.class)); - verify(entityManager).createQuery(criteriaQuery); - verify(mockQuery).getResultList(); - } - - @Test - void testPagination() { - JPAQuery query = new JPAQuery(repository, Function.identity(), rootType); - query.limit(10); - query.offset(0); - - query.execute(); - - verify(criteriaQuery).from(rootType); - verify(criteriaQuery, never()).where(any(Predicate.class)); - verify(criteriaQuery, never()).orderBy(any(List.class)); - verify(entityManager).createQuery(criteriaQuery); - verify(mockQuery).setFirstResult(0); - verify(mockQuery).setMaxResults(10); - verify(mockQuery).getResultList(); - } - - @Test - void testOrderBy() { - Root root = mock(Root.class); - when(root.get(any(String.class))).thenAnswer(inv -> { - Path path = mock(Path.class); - when(path.getAlias()).thenReturn(inv.getArgument(0)); - return path; - }); - when(criteriaQuery.from(rootType)).thenReturn(root); - when(criteriaBuilder.asc(any())).thenAnswer(inv -> { - Order order = mock(Order.class); - when(order.isAscending()).thenReturn(true); - when(order.getExpression()).thenReturn(inv.getArgument(0)); - return order; - }); - when(criteriaBuilder.desc(any())).thenAnswer(inv -> { - Order order = mock(Order.class); - when(order.isAscending()).thenReturn(false); - when(order.getExpression()).thenReturn(inv.getArgument(0)); - return order; - }); - - JPAQuery query = new JPAQuery(repository, Function.identity(), rootType); - query.sort(asList(orderBy("name", DESC), orderBy("date", ASC))); - - query.execute(); - - verify(criteriaQuery).from(rootType); - verify(criteriaQuery, never()).where(any(Predicate.class)); - ArgumentCaptor> captor = ArgumentCaptor.forClass(List.class); - verify(criteriaQuery).orderBy(captor.capture()); - assertThat(captor.getValue()).hasSize(2); - assertThat(captor.getValue().get(0).isAscending()).isFalse(); - assertThat(captor.getValue().get(0).getExpression().getAlias()).isEqualTo("name"); - assertThat(captor.getValue().get(1).isAscending()).isTrue(); - assertThat(captor.getValue().get(1).getExpression().getAlias()).isEqualTo("date"); - verify(entityManager).createQuery(criteriaQuery); - verify(mockQuery).getResultList(); - } - -} 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 91b5488eaa..168041a92d 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 @@ -18,58 +18,13 @@ */ package org.kie.kogito.index.postgresql.storage; -import java.util.UUID; - -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.model.JobEntity; -import org.kie.kogito.index.jpa.model.JobEntityRepository; -import org.kie.kogito.index.model.Job; -import org.kie.kogito.index.test.TestUtils; -import org.kie.kogito.persistence.api.StorageService; +import org.kie.kogito.index.jpa.storage.AbstractJobStorageIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -public class JobStorageIT extends AbstractStorageIT { - - @Inject - JobEntityRepository repository; - - @Inject - StorageService storage; - - public JobStorageIT() { - super(Job.class); - } - - @Override - public JobEntityRepository getRepository() { - return repository; - } - - @Override - public StorageService getStorage() { - return storage; - } - - @Test - public void testJobEntity() { - String jobId = UUID.randomUUID().toString(); - String processInstanceId = UUID.randomUUID().toString(); - - Job job1 = TestUtils - .createJob(jobId, processInstanceId, RandomStringUtils.randomAlphabetic(5), UUID.randomUUID().toString(), - RandomStringUtils.randomAlphabetic(10), "EXPECTED", 0L); - Job job2 = TestUtils - .createJob(jobId, processInstanceId, RandomStringUtils.randomAlphabetic(5), UUID.randomUUID().toString(), - RandomStringUtils.randomAlphabetic(10), "SCHEDULED", 1000L); - testStorage(jobId, job1, job2); - } - +public class JobStorageIT extends AbstractJobStorageIT { } 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 5fe6e69c8d..627733c823 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 @@ -18,54 +18,13 @@ */ package org.kie.kogito.index.postgresql.storage; -import java.util.Set; - -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity; -import org.kie.kogito.index.jpa.model.ProcessDefinitionEntityRepository; -import org.kie.kogito.index.jpa.storage.ProcessDefinitionEntityStorage; -import org.kie.kogito.index.model.ProcessDefinition; -import org.kie.kogito.index.test.TestUtils; -import org.kie.kogito.persistence.api.StorageService; +import org.kie.kogito.index.jpa.storage.AbstractProcessDefinitionStorageIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -class ProcessDefinitionStorageIT extends AbstractStorageIT { - - @Inject - ProcessDefinitionEntityRepository repository; - - @Inject - StorageService storage; - - public ProcessDefinitionStorageIT() { - super(ProcessDefinition.class); - } - - @Override - public ProcessDefinitionEntityStorage.RepositoryAdapter getRepository() { - return new ProcessDefinitionEntityStorage.RepositoryAdapter(repository); - } - - @Override - public StorageService getStorage() { - return storage; - } - - @Test - void testProcessDefinitionEntity() { - String processId = RandomStringUtils.randomAlphabetic(10); - String version = "1.0"; - ProcessDefinition pdv1 = TestUtils.createProcessDefinition(processId, version, Set.of("admin", "kogito")); - ProcessDefinition pdv2 = TestUtils.createProcessDefinition(processId, version, Set.of("kogito")); - testStorage(pdv1.getKey(), pdv1, pdv2); - } - +class ProcessDefinitionStorageIT extends AbstractProcessDefinitionStorageIT { } 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 6b6b43d8fe..0ad8baf9b6 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 @@ -18,37 +18,13 @@ */ package org.kie.kogito.index.postgresql.storage; -import java.util.UUID; - -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.model.ProcessInstanceEntityRepository; -import org.kie.kogito.index.model.ProcessInstanceState; -import org.kie.kogito.index.test.TestUtils; +import org.kie.kogito.index.jpa.storage.AbstractProcessInstanceStorageIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -public class ProcessInstanceStorageIT { - - @Inject - ProcessInstanceEntityRepository repository; - - @Test - public void testProcessInstanceEntity() { - String processInstanceId = UUID.randomUUID().toString(); - TestUtils - .createProcessInstance(processInstanceId, RandomStringUtils.randomAlphabetic(5), UUID.randomUUID().toString(), - RandomStringUtils.randomAlphabetic(10), ProcessInstanceState.ACTIVE.ordinal(), 0L); - TestUtils - .createProcessInstance(processInstanceId, RandomStringUtils.randomAlphabetic(5), UUID.randomUUID().toString(), - RandomStringUtils.randomAlphabetic(10), ProcessInstanceState.COMPLETED.ordinal(), 1000L); - - } - +public class ProcessInstanceStorageIT extends AbstractProcessInstanceStorageIT { } 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 33e06afd01..4ada5a0753 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 @@ -18,38 +18,13 @@ */ package org.kie.kogito.index.postgresql.storage; -import java.util.UUID; - -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.jupiter.api.Test; -import org.kie.kogito.index.jpa.model.UserTaskInstanceEntityRepository; -import org.kie.kogito.index.test.TestUtils; +import org.kie.kogito.index.jpa.storage.AbstractUserTaskInstanceStorageIT; import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; - @QuarkusTest @QuarkusTestResource(PostgreSqlQuarkusTestResource.class) -public class UserTaskInstanceStorageIT { - - @Inject - UserTaskInstanceEntityRepository repository; - - @Test - public void testUserTaskInstanceEntity() { - String taskId = UUID.randomUUID().toString(); - String processInstanceId = UUID.randomUUID().toString(); - TestUtils - .createUserTaskInstance(taskId, processInstanceId, RandomStringUtils.randomAlphabetic(5), - UUID.randomUUID().toString(), - RandomStringUtils.randomAlphabetic(10), "InProgress", 0L); - TestUtils - .createUserTaskInstance(taskId, processInstanceId, RandomStringUtils.randomAlphabetic(5), - UUID.randomUUID().toString(), - RandomStringUtils.randomAlphabetic(10), "Completed", 1000L); - } - +public class UserTaskInstanceStorageIT extends AbstractUserTaskInstanceStorageIT { } diff --git a/data-index/data-index-storage/pom.xml b/data-index/data-index-storage/pom.xml index d7f550b721..c939ad4880 100644 --- a/data-index/data-index-storage/pom.xml +++ b/data-index/data-index-storage/pom.xml @@ -36,11 +36,11 @@ data-index-storage-api data-index-storage-protobuf data-index-storage-postgresql - data-index-storage-jpa + data-index-storage-jpa-common data-index-storage-common data-index-storage-infinispan data-index-storage-mongodb data-index-storage-postgresql-reporting - data-index-storage-oracle + data-index-storage-jpa \ No newline at end of file diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java deleted file mode 100644 index c6b7cc143a..0000000000 --- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.test.containers; - -/** - * This container wraps Data Index Service container - */ -public class DataIndexOracleContainer extends AbstractDataIndexContainer { - public static final String NAME = "data-index-service-oracle"; - - public DataIndexOracleContainer() { - super(NAME); - } - - public void setDatabaseURL(String oracleURL, String username, String password) { - addEnv("QUARKUS_DATASOURCE_JDBC_URL", oracleURL); - addEnv("QUARKUS_DATASOURCE_USERNAME", username); - addEnv("QUARKUS_DATASOURCE_PASSWORD", password); - addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true"); - addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true"); - } - - @Override - public String getResourceName() { - return NAME; - } - -} diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java deleted file mode 100644 index e72a31e8e8..0000000000 --- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.test.quarkus.http; - -import java.util.HashMap; -import java.util.Map; - -public class DataIndexOracleHttpQuarkusTestResource extends AbstractDataIndexHttpQuarkusTestResource { - - public DataIndexOracleHttpQuarkusTestResource() { - super(new DataIndexOracleHttpResource()); - } - - @Override - protected Map getProperties() { - Map properties = new HashMap<>(); - properties.putAll(getDataIndexConnectionProperties()); - properties.putAll(getTestResource().getProperties()); - return properties; - } - -} diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java deleted file mode 100644 index fc8f666f14..0000000000 --- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.test.quarkus.http; - -import java.util.HashMap; -import java.util.Map; - -import org.kie.kogito.index.test.containers.DataIndexOracleContainer; -import org.kie.kogito.test.resources.TestResource; -import org.kie.kogito.testcontainers.KogitoOracleSqlContainer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testcontainers.containers.Network; - -public class DataIndexOracleHttpResource implements TestResource { - - private static final Logger LOGGER = LoggerFactory.getLogger(DataIndexOracleHttpResource.class); - - KogitoOracleSqlContainer oracle = new KogitoOracleSqlContainer(); - DataIndexOracleContainer dataIndex = new DataIndexOracleContainer(); - Map properties = new HashMap<>(); - - @Override - public String getResourceName() { - return dataIndex.getResourceName(); - } - - @Override - public void start() { - LOGGER.debug("Starting Oracle Quarkus test resource"); - properties.clear(); - Network network = Network.newNetwork(); - oracle.withNetwork(network); - oracle.withNetworkAliases("oracle"); - oracle.withUsername("kogito"); - oracle.withPassword("kogito"); - oracle.start(); - - dataIndex.addProtoFileFolder(); - dataIndex.withNetwork(network); - dataIndex.setDatabaseURL("jdbc:oracle:thin:@oracle:1521/" + oracle.getDatabaseName(), - oracle.getUsername(), oracle.getPassword()); - dataIndex.addEnv("QUARKUS_PROFILE", "http-events-support"); - dataIndex.start(); - LOGGER.debug("Oracle Quarkus test resource started"); - } - - @Override - public void stop() { - dataIndex.stop(); - oracle.stop(); - LOGGER.debug("Oracle Quarkus test resource stopped"); - } - - @Override - public int getMappedPort() { - return dataIndex.getMappedPort(); - } - - public Map getProperties() { - return properties; - } -} diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java deleted file mode 100644 index 968ad34f5e..0000000000 --- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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.test.quarkus.kafka; - -import java.util.HashMap; -import java.util.Map; - -import org.kie.kogito.index.test.containers.DataIndexOracleContainer; -import org.kie.kogito.index.test.containers.KogitoKafkaContainerWithoutBridge; -import org.kie.kogito.test.resources.TestResource; -import org.kie.kogito.testcontainers.Constants; -import org.kie.kogito.testcontainers.KogitoOracleSqlContainer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testcontainers.containers.Network; -import org.testcontainers.containers.wait.strategy.Wait; - -public class DataIndexOracleKafkaResource implements TestResource { - - private static final Logger LOGGER = LoggerFactory.getLogger(DataIndexOracleKafkaResource.class); - - KogitoKafkaContainerWithoutBridge kafka = new KogitoKafkaContainerWithoutBridge(); - KogitoOracleSqlContainer oracle = new KogitoOracleSqlContainer(); - DataIndexOracleContainer dataIndex = new DataIndexOracleContainer(); - Map properties = new HashMap<>(); - - @Override - public String getResourceName() { - return dataIndex.getResourceName(); - } - - @Override - public void start() { - LOGGER.debug("Starting Oracle Quarkus test resource"); - properties.clear(); - Network network = Network.newNetwork(); - oracle.withNetwork(network); - oracle.withNetworkAliases("oracle"); - oracle.withUsername("kogito"); - oracle.withPassword("kogito"); - oracle.start(); - kafka.withNetwork(network); - kafka.withNetworkAliases("kafka"); - kafka.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT); - kafka.start(); - String kafkaURL = kafka.getBootstrapServers(); - properties.put("kafka.bootstrap.servers", kafkaURL); - properties.put("spring.kafka.bootstrap-servers", kafkaURL); - - dataIndex.addProtoFileFolder(); - dataIndex.withNetwork(network); - dataIndex.setDatabaseURL("jdbc:oracle:thin:@oracle:1521/" + oracle.getDatabaseName(), - oracle.getUsername(), oracle.getPassword()); - dataIndex.setKafkaURL("kafka:29092"); - dataIndex.addEnv("QUARKUS_PROFILE", "kafka-events-support"); - dataIndex.start(); - LOGGER.debug("Oracle Quarkus test resource started"); - } - - @Override - public void stop() { - dataIndex.stop(); - oracle.stop(); - kafka.stop(); - LOGGER.debug("Oracle Quarkus test resource stopped"); - } - - @Override - public int getMappedPort() { - return dataIndex.getMappedPort(); - } - - public Map getProperties() { - return properties; - } -} diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java deleted file mode 100644 index 1466378146..0000000000 --- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.quarkus.kafka; - -import java.util.HashMap; -import java.util.Map; - -import org.kie.kogito.test.resources.ConditionalQuarkusTestResource; - -import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL; - -public class DataIndexOracleQuarkusKafkaTestResource extends ConditionalQuarkusTestResource { - public DataIndexOracleQuarkusKafkaTestResource() { - super(new DataIndexOracleKafkaResource()); - } - - @Override - protected Map getProperties() { - Map properties = new HashMap<>(); - properties.put(KOGITO_DATA_INDEX_SERVICE_URL, "http://localhost:" + getTestResource().getMappedPort()); - properties.putAll(getTestResource().getProperties()); - return properties; - } - -} diff --git a/kogito-apps-bom/pom.xml b/kogito-apps-bom/pom.xml index a25c91ac82..9e66235c59 100644 --- a/kogito-apps-bom/pom.xml +++ b/kogito-apps-bom/pom.xml @@ -1,4 +1,3 @@ - 1.0.0 + ${project.version} @@ -135,6 +136,53 @@ + + + + + + org.codehaus.mojo + exec-maven-plugin + + + org.drools + drools-util + ${version.drools.util} + + + + + Remove comments from generated files + prepare-package + + java + + + false + true + + org.drools + drools-util + + org.drools.util.RemoveCommentsMain + + true + ${project.basedir}/target/classes/META-INF/quarkus-javadoc.properties + ${project.basedir}/target/classes/META-INF/quarkus-extension.properties + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.jdp + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.jdp + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.jdp + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexBuildConfig.jdp + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.jdp + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.jdp + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.jdp + ${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.jdp + + + + + + From c22400e555e6d8f1d3ea19c1ec842f4030d4f3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Mon, 12 Feb 2024 16:28:29 +0100 Subject: [PATCH 04/20] incubator-kie-issues#878: upgrade `keycloak-js` version in `@kogito-apps/consoles-common` (#1973) * incubator-kie-issues#878: upgrade keycloak-js version in @kogito-apps/consoles-common * - fix formatting --- .../packages/consoles-common/package.json | 2 +- .../src/utils/KeycloakClient.ts | 4 +-- ui-packages/pnpm-lock.yaml | 27 ++++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ui-packages/packages/consoles-common/package.json b/ui-packages/packages/consoles-common/package.json index 56ef5aeb3c..6e3f70bdc9 100644 --- a/ui-packages/packages/consoles-common/package.json +++ b/ui-packages/packages/consoles-common/package.json @@ -37,7 +37,7 @@ "gql-query-builder": "3.1.3", "graphql-tag": "2.0.0", "history": "^4.10.1", - "keycloak-js": "^13.0.1", + "keycloak-js": "^23.0.5", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router": "^5.3.4", diff --git a/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts b/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts index d97dd1d27f..0924b8a0f9 100644 --- a/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts +++ b/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts @@ -73,8 +73,8 @@ export const checkAuthServerHealth = () => { }); }; -export const getKeycloakClient = (): Keycloak.KeycloakInstance => { - return Keycloak({ +export const getKeycloakClient = (): Keycloak => { + return new Keycloak({ realm: window['KOGITO_CONSOLES_KEYCLOAK_REALM'], url: window['KOGITO_CONSOLES_KEYCLOAK_URL'], clientId: window['KOGITO_CONSOLES_KEYCLOAK_CLIENT_ID'] diff --git a/ui-packages/pnpm-lock.yaml b/ui-packages/pnpm-lock.yaml index 91905da312..b7da5f539e 100644 --- a/ui-packages/pnpm-lock.yaml +++ b/ui-packages/pnpm-lock.yaml @@ -286,8 +286,8 @@ importers: specifier: ^4.10.1 version: 4.10.1 keycloak-js: - specifier: ^13.0.1 - version: 13.0.1 + specifier: ^23.0.5 + version: 23.0.5 react: specifier: ^17.0.2 version: 17.0.2 @@ -8495,13 +8495,8 @@ packages: resolution: {integrity: sha512-pNdYkNPiJUnEhnfXV56+sQy8+AaPcG3POZAUnwr4EeqCUZFz4u2PePbo3e5Gj4ziYPCWGUZT9RHisvJKnwFuBQ==} dev: false - /base64-js@1.3.1: - resolution: {integrity: sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==} - dev: false - /base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - dev: true /base@0.11.2: resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==} @@ -13535,8 +13530,8 @@ packages: resolution: {integrity: sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==} dev: true - /js-sha256@0.9.0: - resolution: {integrity: sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==} + /js-sha256@0.10.1: + resolution: {integrity: sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw==} dev: false /js-tokens@4.0.0: @@ -13753,11 +13748,17 @@ packages: resolution: {integrity: sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==} dev: false - /keycloak-js@13.0.1: - resolution: {integrity: sha512-S9mFX8HHlgw+i2HAIhteccrkffQmUn4CpYcU8ViGnODSBcnaf2YTtLhiiRH/a6SaOBpxmJTN3XVIZbE9d/HyXQ==} + /jwt-decode@4.0.0: + resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==} + engines: {node: '>=18'} + dev: false + + /keycloak-js@23.0.5: + resolution: {integrity: sha512-etSFCG/sh1rBV8RJRgKsuVBJwtzeZaO5eI8B3ZIhxGwQLo9bObZHYDgthvMik35sYIbepV1LU9N0pZ+3sxai3w==} dependencies: - base64-js: 1.3.1 - js-sha256: 0.9.0 + base64-js: 1.5.1 + js-sha256: 0.10.1 + jwt-decode: 4.0.0 dev: false /keyv@3.1.0: From 09a01d95d0a14d3a9fac97e3fc7efd97d3303d01 Mon Sep 17 00:00:00 2001 From: Martin Weiler Date: Wed, 14 Feb 2024 09:05:58 -0700 Subject: [PATCH 05/20] [kie-issues#923] Add index to foreign key columns to improve performance in postgresql (#1985) --- .../db/migration/V1.45.0.3__add_fk_index.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.3__add_fk_index.sql diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.3__add_fk_index.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.3__add_fk_index.sql new file mode 100644 index 0000000000..72e909ac55 --- /dev/null +++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.3__add_fk_index.sql @@ -0,0 +1,17 @@ +create index if not exists idx_attachments_tid on attachments(task_id); +create index if not exists idx_comments_tid on comments(task_id); +create index if not exists idx_definitions_addons_pid_pv on definitions_addons(process_id, process_version); +create index if not exists idx_definitions_annotations_pid_pv on definitions_annotations(process_id, process_version); +create index if not exists idx_definitions_metadata_pid_pv on definitions_metadata(process_id, process_version); +create index if not exists idx_definitions_nodes_pid_pv on definitions_nodes(process_id, process_version); +create index if not exists idx_definitions_nodes_metadata_pid_pv on definitions_nodes_metadata(process_id, process_version); +create index if not exists idx_definitions_roles_pid_pv on definitions_roles(process_id, process_version); +create index if not exists idx_milestones_piid on milestones(process_instance_id); +create index if not exists idx_nodes_piid on nodes(process_instance_id); +create index if not exists idx_processes_addons_pid on processes_addons(process_id); +create index if not exists idx_processes_roles_pid on processes_roles(process_id); +create index if not exists idx_tasks_admin_groups_tid on tasks_admin_groups(task_id); +create index if not exists idx_tasks_admin_users_tid on tasks_admin_users(task_id); +create index if not exists idx_tasks_excluded_users_tid on tasks_excluded_users(task_id); +create index if not exists idx_tasks_potential_groups_tid on tasks_potential_groups(task_id); +create index if not exists idx_tasks_potential_users_tid on tasks_potential_users(task_id); From bcc8e5bf343f367fb2bb7d6811af571b92e9b59d Mon Sep 17 00:00:00 2001 From: Paulo Martins Date: Thu, 15 Feb 2024 14:38:04 -0300 Subject: [PATCH 06/20] KOGITO-10047: Enable SWF Dev UI extension for Quarkus 3 (#1982) * KOGITO-10047: Enable SWF Dev UI extension for Quarkus 3 * KOGITO-10047: Enable SWF Dev UI extension for Quarkus 3 --- .../pom.xml | 24 ++++++- .../tools/deployment/DevConsoleProcessor.java | 70 +++++++++++++++++-- .../src/main/resources/static/index.html | 48 +++++++++++++ .../impl/CustomDashboardStorageImpl.java | 4 ++ .../runtime-tools-dev-ui-webapp/package.json | 2 +- .../src/channel/apis/apis.tsx | 66 ++++++++++------- .../src/channel/apis/tests/apis.test.tsx | 3 + ui-packages/pnpm-lock.yaml | 14 ++-- 8 files changed, 187 insertions(+), 44 deletions(-) create mode 100644 kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/static/index.html diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml index de3cd1776b..39d488086e 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml @@ -130,7 +130,7 @@ copy-resources - ${basedir}/target/classes/dev-static/webapp + ${basedir}/target/classes/dev-static/resources/webapp ${path.to.webapp.app}/dist/resources/webapp @@ -143,6 +143,7 @@ + copy-envelope-resources process-resources @@ -150,7 +151,7 @@ copy-resources - ${basedir}/target/classes/dev-static/ + ${basedir}/target/classes/dev-static/resources ${path.to.webapp.app}/dist/resources @@ -175,6 +176,25 @@ + + + copy-index + process-resources + + copy-resources + + + ${basedir}/target/classes/dev-static + + + ${basedir}/target/classes/static + + index.html + + + + + 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 effce8f5a5..8c21398e45 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 @@ -19,6 +19,8 @@ package org.kie.kogito.swf.tools.deployment; import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.nio.file.Path; import java.util.Optional; @@ -30,15 +32,20 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ConfigurationBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.LiveReloadBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; import io.quarkus.deployment.util.WebJarUtil; import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; +import io.quarkus.devui.spi.page.CardPageBuildItem; +import io.quarkus.devui.spi.page.Page; import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder; +import io.quarkus.vertx.http.runtime.management.ManagementInterfaceBuildTimeConfig; public class DevConsoleProcessor { @@ -46,6 +53,36 @@ public class DevConsoleProcessor { 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) + public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, + ManagementInterfaceBuildTimeConfig managementInterfaceBuildTimeConfig, + LaunchModeBuildItem launchModeBuildItem, + ConfigurationBuildItem configurationBuildItem) throws UnsupportedEncodingException { + + String uiPath = nonApplicationRootPathBuildItem.resolveManagementPath(BASE_RELATIVE_URL, + managementInterfaceBuildTimeConfig, launchModeBuildItem, true); + + String devUIUrl = getProperty(configurationBuildItem, "kogito.dev-ui.url"); + String devUIUrlQueryParam = devUIUrl != null ? "&devUIUrl=" + URLEncoder.encode(devUIUrl, "UTF-8") : ""; + + String dataIndexUrl = getProperty(configurationBuildItem, "kogito.data-index.url"); + String dataIndexUrlQueryParam = dataIndexUrl != null ? "&dataIndexUrl=" + URLEncoder.encode(dataIndexUrl, "UTF-8") : ""; + + CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); + + cardPageBuildItem.addPage(Page.externalPageBuilder("Workflows") + .url(uiPath + "/index.html?page=Processes" + devUIUrlQueryParam + dataIndexUrlQueryParam, uiPath) + .isHtmlContent() + .icon("font-awesome-solid:diagram-project")); + + cardPageBuildItem.addPage(Page.externalPageBuilder("Monitoring") + .url(uiPath + "/index.html?page=Monitoring" + devUIUrlQueryParam + dataIndexUrlQueryParam, uiPath) + .isHtmlContent() + .icon("font-awesome-solid:gauge-high")); + + return cardPageBuildItem; + } + @BuildStep(onlyIf = IsDevelopment.class) @Record(ExecutionTime.RUNTIME_INIT) public void deployStaticResources(final DevConsoleRecorder recorder, @@ -66,12 +103,6 @@ public void deployStaticResources(final DevConsoleRecorder recorder, STATIC_RESOURCES_PATH, true); - routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder() - .route(BASE_RELATIVE_URL + "/resources/*") - .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(), - shutdownContext)) - .build()); - routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder() .route(BASE_RELATIVE_URL + "/*") .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(), @@ -87,4 +118,31 @@ public void isDataIndexAvailable(BuildProducer devConsoleTemplateInfoBuildItemBuildProducer.produce(new DevConsoleTemplateInfoBuildItem("isDataIndexAvailable", dataIndexServiceAvailableBuildItem.isPresent() || capabilities.isPresent(DATA_INDEX_CAPABILITY))); } + + private static String getProperty(ConfigurationBuildItem configurationBuildItem, + String propertyKey) { + + String propertyValue = configurationBuildItem + .getReadResult() + .getAllBuildTimeValues() + .get(propertyKey); + + if (propertyValue == null) { + propertyValue = configurationBuildItem + .getReadResult() + .getBuildTimeRunTimeValues() + .get(propertyKey); + } else { + return propertyValue; + } + + if (propertyValue == null) { + propertyValue = configurationBuildItem + .getReadResult() + .getRunTimeDefaultValues() + .get(propertyKey); + } + + return propertyValue; + } } diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/static/index.html b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/static/index.html new file mode 100644 index 0000000000..4040f1fbea --- /dev/null +++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/static/index.html @@ -0,0 +1,48 @@ + +
+ + + 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 3afdcf16dc..a2a00437c0 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 @@ -90,6 +90,10 @@ private void start(final URL classLoaderCustomDashboardUrl, final URL customDash } catch (Exception ex) { LOGGER.warn("Couldn't properly initialize CustomDashboardStorageImpl"); } finally { + if (classLoaderCustomDashboardUrl == null) { + return; + } + init(readCustomDashboardResources()); String storageUrl = getStorageUrl(classLoaderCustomDashboardUrl); Thread t = new Thread(new DashboardFilesWatcher(reload(), storageUrl)); diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json b/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json index 3151e8ed15..a3d380faf6 100644 --- a/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json +++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json @@ -127,7 +127,7 @@ "mini-css-extract-plugin": "^2.7.6", "node-polyfill-webpack-plugin": "^2.0.1", "nodemon": "^2.0.22", - "openapi-types": "^9.3.1", + "openapi-types": "^7.0.1", "raw-loader": "^4.0.2", "rimraf": "^3.0.2", "sass-loader": "^12.6.0", diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx index f142094cec..b7faaa24e0 100755 --- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx +++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx @@ -16,6 +16,8 @@ * specific language governing permissions and limitations * under the License. */ + +import { OpenAPI } from 'openapi-types'; import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql'; import { BulkProcessInstanceActionResponse, @@ -542,38 +544,50 @@ export const getCustomDashboardContent = (name: string): Promise => { }); }; -export const getCustomWorkflowSchema = ( +export const getCustomWorkflowSchemaFromApi = async ( + api: OpenAPI.Document, + workflowName: string +): Promise> => { + let schema = {}; + + try { + const schemaFromRequestBody = + api.paths['/' + workflowName].post.requestBody.content['application/json'] + .schema; + + if (schemaFromRequestBody.type) { + schema = { + type: schemaFromRequestBody.type, + properties: schemaFromRequestBody.properties + }; + } else { + schema = (api as any).components.schemas[workflowName + '_input']; + } + } catch (e) { + console.log(e); + schema = (api as any).components.schemas[workflowName + '_input']; + } + + // Components can contain the content of internal refs ($ref) + // This keeps the refs working while avoiding circular refs with the workflow itself + if (schema) { + const { [workflowName + '_input']: _, ...schemas } = + (api as any).components?.schemas ?? {}; + (schema as any)['components'] = { schemas }; + } + + return schema ?? null; +}; + +export const getCustomWorkflowSchema = async ( devUIUrl: string, openApiPath: string, workflowName: string ): Promise> => { return new Promise((resolve, reject) => { SwaggerParser.parse(`${devUIUrl}/${openApiPath}`) - .then((response: any) => { - let schema = {}; - try { - const schemaFromRequestBody = - response.paths['/' + workflowName].post.requestBody.content[ - 'application/json' - ].schema; - /* istanbul ignore else*/ - if (schemaFromRequestBody.type) { - schema = { - type: schemaFromRequestBody.type, - properties: schemaFromRequestBody.properties - }; - } else { - schema = response.components.schemas[workflowName + '_input']; - } - } catch (e) { - console.log(e); - schema = response.components.schemas[workflowName + '_input']; - } - if (schema) { - resolve(schema); - } else { - resolve(null); - } + .then(async (response: any) => { + resolve(await getCustomWorkflowSchemaFromApi(response, workflowName)); }) .catch((err) => reject(err)); }); diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx index 143939d6e4..b5ae6846aa 100755 --- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx +++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx @@ -1108,6 +1108,9 @@ describe('swf custom form tests', () => { it('get custom workflow schema - success - with workflowdata', async () => { const schema = { + components: { + schemas: {} + }, type: 'object', properties: { name: { diff --git a/ui-packages/pnpm-lock.yaml b/ui-packages/pnpm-lock.yaml index b7da5f539e..9460833c32 100644 --- a/ui-packages/pnpm-lock.yaml +++ b/ui-packages/pnpm-lock.yaml @@ -1859,7 +1859,7 @@ importers: dependencies: '@apidevtools/swagger-parser': specifier: ^10.1.0 - version: 10.1.0(openapi-types@9.3.1) + version: 10.1.0(openapi-types@7.2.3) '@babel/standalone': specifier: ^7.22.8 version: 7.22.8 @@ -2138,8 +2138,8 @@ importers: specifier: ^2.0.22 version: 2.0.22 openapi-types: - specifier: ^9.3.1 - version: 9.3.1 + specifier: ^7.0.1 + version: 7.2.3 raw-loader: specifier: ^4.0.2 version: 4.0.2(webpack@5.88.1) @@ -3144,7 +3144,7 @@ packages: resolution: {integrity: sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==} dev: false - /@apidevtools/swagger-parser@10.1.0(openapi-types@9.3.1): + /@apidevtools/swagger-parser@10.1.0(openapi-types@7.2.3): resolution: {integrity: sha512-9Kt7EuS/7WbMAUv2gSziqjvxwDbFSg3Xeyfuj5laUODX8o/k/CpsAKiQ8W7/R88eXFTMbJYg6+7uAmOWNKmwnw==} peerDependencies: openapi-types: '>=7' @@ -3156,7 +3156,7 @@ packages: ajv: 8.12.0 ajv-draft-04: 1.0.0(ajv@8.12.0) call-me-maybe: 1.0.2 - openapi-types: 9.3.1 + openapi-types: 7.2.3 dev: false /@apollo/protobufjs@1.2.2: @@ -14866,10 +14866,6 @@ packages: /openapi-types@7.2.3: resolution: {integrity: sha512-olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA==} - dev: false - - /openapi-types@9.3.1: - resolution: {integrity: sha512-/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw==} /optimism@0.10.3: resolution: {integrity: sha512-9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw==} From 3c59a08fffcbd5ec3456450c52d4c8bfeddc39b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Fri, 16 Feb 2024 09:01:27 +0100 Subject: [PATCH 07/20] incubator-kie-issues#918: Verify Quarkus Extensions metadata in `kogito-apps` (#1986) * incubator-kie-issues#918: Verify Quarkus Extensions metadata in `kogito-apps` * - fixes --- .../runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 12 +++++++++--- .../runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 12 +++++++++--- .../resources/META-INF/quarkus-extension.yaml | 12 +++++++++--- .../runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 16 +++++++++++++--- .../runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 16 +++++++++++++--- .../runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 16 +++++++++++++--- .../runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 16 +++++++++++++--- .../job-http-recipient/runtime/pom.xml | 3 +++ .../resources/META-INF/quarkus-extension.yaml | 14 ++++++++++++-- .../job-sink-recipient/runtime/pom.xml | 6 ++++-- .../resources/META-INF/quarkus-extension.yaml | 17 +++++++++++++++-- .../runtime/pom.xml | 3 +++ .../resources/META-INF/quarkus-extension.yaml | 12 +++++++++--- .../pom.xml | 3 +++ .../resources/META-INF/quarkus-extension.yaml | 5 ++++- .../runtime-tools-quarkus-extension/pom.xml | 3 +++ .../resources/META-INF/quarkus-extension.yaml | 12 ++++++++++-- 23 files changed, 151 insertions(+), 39 deletions(-) diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml index 4b7f517f3b..28cb71c89f 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml @@ -58,7 +58,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.kie.kogito.data-index.persistence + org.kie.kogito.data-index.persistence.infinispan diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml index f128cd3d65..3fae68a5bd 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,18 @@ # under the License. # -name: Kogito Addons Quarkus Data Index Persistence Infinispan -description: Kogito Data Index Persistence Infinispan Add-On +name: Kogito Data Index Persistence Infinispan Quarkus Add-On +description: Add-On to colocate the Data Index Persistence (Infinispan) in your application. metadata: keywords: - data-index - kogito + - processes + - workflows + - tasks + - jobs + - BPMN guide: https://quarkus.io/guides/kogito categories: - - "business-automation" \ No newline at end of file + - "business-automation" + status: "stable" \ No newline at end of file diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml index 4c53eaf404..8972d5ec7a 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml @@ -54,7 +54,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.kie.kogito.data-index.persistence + org.kie.kogito.data-index.persistence.mongodb diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 4889d304d8..28f1f13b0e 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,18 @@ # under the License. # -name: Kogito Addons Quarkus Data Index Persistence MongoDB -description: Kogito Data Index Persistence MongoDB Add-On +name: Kogito Data Index Persistence MongoDB Quarkus Add-On +description: Add-On to colocate the Data Index Persistence (MongoDb) in your application. metadata: keywords: - data-index - kogito + - processes + - workflows + - tasks + - jobs + - BPMN guide: https://quarkus.io/guides/kogito categories: - - "business-automation" \ No newline at end of file + - "business-automation" + status: "stable" \ No newline at end of file diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml index bcdc2b21be..b4bf0bc14c 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,18 @@ # under the License. # -name: Kogito Addons Quarkus Data Index Persistence PostgreSQL -description: Kogito Data Index Persistence PostgreSQL Add-On +name: Kogito Data Index Persistence PostgreSQL Quarkus Add-On +description: Add-On to colocate the Data Index Persistence (PostgreSQL) in your application. metadata: keywords: - data-index - kogito + - processes + - workflows + - tasks + - jobs + - BPMN guide: https://quarkus.io/guides/kogito categories: - - "business-automation" \ No newline at end of file + - "business-automation" + status: "stable" \ No newline at end of file diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml index eaa379a481..4a72edac22 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml @@ -54,7 +54,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.kie.kogito.data-index + org.kie.kogito.data-index.infinispan diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml index c7eab06352..a23a22c1af 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,22 @@ # under the License. # -name: Kogito Addons Quarkus Data Index Infinispan -description: Kogito Data Index Infinispan Add-On +name: Kogito Add-On Quarkus Data Index Infinispan +description: Runs the Kogito Data Index embedded with Infinispan persistence metadata: keywords: - data-index - kogito + - processes + - workflows + - tasks + - jobs + - BPMN + - infinispan guide: https://quarkus.io/guides/kogito categories: - - "business-automation" \ No newline at end of file + - "business-automation" + status: "stable" + config: + - "kogito.data-index." + - "kogito.dataindex." \ No newline at end of file diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml index 3136f2db4a..0afc977c9e 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml @@ -62,7 +62,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.kie.kogito.data-index + org.kie.kogito.data-index.in-memory diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 81daebd833..a9ae3a74ce 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,22 @@ # under the License. # -name: Kogito Addons Quarkus Data Index In-memory -description: Kogito Data Index In-memory Add-On +name: Kogito Data Index In-memory Quarkus Add-On +description: Runs the Kogito Data Index embedded with In-memory persistence metadata: keywords: - data-index - kogito + - processes + - workflows + - tasks + - jobs + - BPMN + - in-memory guide: https://quarkus.io/guides/kogito categories: - - "business-automation" \ No newline at end of file + - "business-automation" + status: "stable" + config: + - "kogito.data-index." + - "kogito.dataindex." \ No newline at end of file diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml index 5e52f0592d..048a0b2580 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml @@ -58,7 +58,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.kie.kogito.data-index + org.kie.kogito.data-index.mongodb diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index e04f00a450..4e638b32b1 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,22 @@ # under the License. # -name: Kogito Addons Quarkus Data Index MongoDB -description: Kogito Data Index MongoDB Add-On +name: Kogito Data Index MongoDB Quarkus Add-On +description: Runs the Kogito Data Index embedded with MongoDB persistence metadata: keywords: - data-index - kogito + - processes + - workflows + - tasks + - jobs + - BPMN + - mongodb guide: https://quarkus.io/guides/kogito categories: - - "business-automation" \ No newline at end of file + - "business-automation" + status: "stable" + config: + - "kogito.data-index." + - "kogito.dataindex." \ No newline at end of file diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml index 191461c653..25ea209962 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml @@ -58,7 +58,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.kie.kogito.data-index + org.kie.kogito.data-index.postgresql diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml index c06bb06e62..87338f83d4 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,22 @@ # under the License. # -name: Kogito Addons Quarkus Data Index PostgreSQL -description: Kogito Data Index PostgreSQL Add-On +name: Kogito Data Index PostgreSQL Quarkus Add-On +description: Runs the Kogito Data Index embedded with PostgreSQL persistence metadata: keywords: - data-index - kogito + - processes + - workflows + - tasks + - jobs + - BPMN + - postgresql guide: https://quarkus.io/guides/kogito categories: - - "business-automation" \ No newline at end of file + - "business-automation" + status: "stable" + config: + - "kogito.data-index." + - "kogito.dataindex." \ No newline at end of file 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 1504cf7645..ead0946c49 100644 --- a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml +++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml @@ -94,6 +94,9 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} + + org.kie.kogito.jobs.http-recipient + diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 100d9038bc..2f5d80af2e 100644 --- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,8 +17,18 @@ # under the License. # -name: Job Http Recipient extension +name: Kogito Job Http Recipient Quarkus Add-On description: Handle HTTP requests based on information from the job recipient. metadata: keywords: - - HTTP, HTTPRecipient \ No newline at end of file + - kogito + - processes + - BPMN + - workflows + - jobs + - HTTP + - HTTPRecipient + guide: https://quarkus.io/guides/kogito + categories: + - "business-automation" + status: "stable" \ No newline at end of file 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 4502c70a00..599dca7be2 100644 --- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml +++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml @@ -99,8 +99,10 @@ extension-descriptor - ${project.groupId}:${project.artifactId}-deployment:${project.version} - + ${project.groupId}:${project.artifactId}-deployment:${project.version} + + org.kie.kogito.jobs.sink-recipient + diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml index cbde8a946a..02c4a4943c 100644 --- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,8 +17,21 @@ # under the License. # -name: Job Sink Recipient extension +name: Kogito Job Sink Recipient extension Quarkus Add-On description: Handle the delivery of cloud events to a knative sink based on the information from the job recipient. metadata: keywords: - - Sink, SinkRecipient \ No newline at end of file + - kogito + - processes + - BPMN + - workflows + - jobs + - Sink + - SinkRecipient + - cloudevents + guide: https://quarkus.io/guides/kogito + categories: + - "business-automation" + status: "stable" + config: + - "kogito.job.recipient.sink." \ No newline at end of file diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml index 22dc476289..a8f786cca8 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml @@ -113,6 +113,9 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} + + org.kie.kogito.jobs.embedded-jobs-service + diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 76d650d377..ce0fa3b515 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,12 +17,18 @@ # under the License. # -name: Jobs Service Embedded Quarkus Addon +name: Kogito Jobs Service Embedded Quarkus Add-On description: Run Jobs Service embedded with the application. metadata: keywords: - - kogito-addons-quarkus-jobs-service-embedded + - kogito + - processes + - BPMN + - workflows + - jobs guide: https://quarkus.io/guides/kogito categories: - - "miscellaneous" + - "business-automation" status: "preview" + config: + - "kogito.job-service." 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 6372f7a801..a37a2b3ab0 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 @@ -133,6 +133,9 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} + + org.sonataflow.quarkus.dev-ui + diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml index 24d5c4be1e..6b857e4b94 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml +++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,11 +17,14 @@ # under the License. # -name: Serverless Workflow Tools + +name: SonataFlow Runtime Tools Quarkus Dev UI +description: Enables the SonataFlow Runtime tools in Quarkus Dev UI metadata: keywords: - "kogito" - "workflows" + - "dev-ui" guide: "https://quarkus.io/guides/kogito" categories: - "business-automation" 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 100acdd4ac..9079b80044 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 @@ -128,6 +128,9 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} + + org.jbpm.quarkus.dev-ui + diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml index e7c3116378..1e6efa0ff5 100644 --- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml +++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml @@ -17,16 +17,24 @@ # under the License. # -name: Kogito Runtime Tools +name: jBPM Runtime Tools Quarkus Dev UI +description: Enables the jBPM Runtime tools in Quarkus Dev UI metadata: keywords: - "kogito" - "drools" - "jbpm" - "processes" + - "tasks" - "rules" - "decisions" + - "BPMN" + - "DMN" + - "DRL" + - "dev-ui" guide: "https://quarkus.io/guides/kogito" categories: - "business-automation" - status: "preview" \ No newline at end of file + status: "preview" + config: + - "kogito." \ No newline at end of file From d8ab17bb4ab76a185da1c3c4f7f0a56328a7eb58 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Sat, 17 Feb 2024 01:30:46 +0100 Subject: [PATCH 08/20] [Fix_#1989] Considering '.' in variable name when merging variables (#1991) * [Fix_#1989] Considering '.' in variable name when merging variables * [Fix_#1989] Walters comments --- .../org/kie/kogito/index/json/JsonUtils.java | 20 ++++++++ .../kie/kogito/index/json/JsonUtilsTest.java | 48 +++++++++++++++++++ ...rocessInstanceVariableDataEventMerger.java | 25 +--------- .../storage/ProcessInstanceEntityStorage.java | 14 ++---- 4 files changed, 73 insertions(+), 34 deletions(-) create mode 100644 data-index/data-index-common/src/test/java/org/kie/kogito/index/json/JsonUtilsTest.java diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java index c1d6a4c8c0..8dbf880581 100644 --- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java +++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java @@ -20,10 +20,14 @@ import org.kie.kogito.event.process.ProcessInstanceDataEvent; import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent; +import org.kie.kogito.jackson.utils.JsonObjectUtils; +import org.kie.kogito.jackson.utils.MergeUtils; +import org.kie.kogito.jackson.utils.ObjectMapperFactory; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.cloudevents.jackson.JsonFormat; @@ -50,4 +54,20 @@ public static ObjectMapper configure(ObjectMapper objectMapper) { objectMapper.registerModule(module); return objectMapper; } + + public static ObjectNode mergeVariable(String variableName, Object variableValue, ObjectNode variables) { + return (ObjectNode) MergeUtils.merge(createObjectNode(variableName, variableValue), variables); + } + + private static ObjectNode createObjectNode(String variableName, Object variableValue) { + int indexOf = variableName.indexOf('.'); + ObjectNode result = ObjectMapperFactory.get().createObjectNode(); + if (indexOf == -1) { + result.set(variableName, JsonObjectUtils.fromValue(variableValue)); + } else { + String name = variableName.substring(0, indexOf); + result.set(name, createObjectNode(variableName.substring(indexOf + 1), variableValue)); + } + return result; + } } diff --git a/data-index/data-index-common/src/test/java/org/kie/kogito/index/json/JsonUtilsTest.java b/data-index/data-index-common/src/test/java/org/kie/kogito/index/json/JsonUtilsTest.java new file mode 100644 index 0000000000..c814d9c879 --- /dev/null +++ b/data-index/data-index-common/src/test/java/org/kie/kogito/index/json/JsonUtilsTest.java @@ -0,0 +1,48 @@ +/* + * 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.json; + +import org.junit.jupiter.api.Test; +import org.kie.kogito.jackson.utils.ObjectMapperFactory; + +import com.fasterxml.jackson.databind.node.ObjectNode; + +import static org.assertj.core.api.Assertions.assertThat; + +public class JsonUtilsTest { + + @Test + void testMergeWithDot() { + ObjectNode expected = ObjectMapperFactory.get().createObjectNode().set("key", ObjectMapperFactory.get().createObjectNode().put("user1", "manolo")); + assertThat(JsonUtils.mergeVariable("key.user1", "manolo", null)).isEqualTo(expected); + } + + @Test + void testSimpleMerge() { + ObjectNode expected = ObjectMapperFactory.get().createObjectNode().put("user1", "manolo"); + assertThat(JsonUtils.mergeVariable("user1", "manolo", null)).isEqualTo(expected); + } + + @Test + void testComplexMergeWithDot() { + ObjectNode expected = ObjectMapperFactory.get().createObjectNode().set("key", ObjectMapperFactory.get().createObjectNode().put("user1", "manolo").put("user2", "pepe")); + assertThat(JsonUtils.mergeVariable("key.user1", "manolo", ObjectMapperFactory.get().createObjectNode().set("key", ObjectMapperFactory.get().createObjectNode().put("user2", "pepe")))) + .isEqualTo(expected); + } +} diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java index f6ae8df0a7..d6102ec7b4 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java @@ -18,9 +18,6 @@ */ package org.kie.kogito.index.storage.merger; -import java.util.HashMap; -import java.util.Map; - import org.kie.kogito.event.process.ProcessInstanceDataEvent; import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent; import org.kie.kogito.event.process.ProcessInstanceVariableEventBody; @@ -29,9 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @@ -44,23 +38,8 @@ public class ProcessInstanceVariableDataEventMerger extends ProcessInstanceEvent public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent data) { pi = getOrNew(pi, data); ProcessInstanceVariableDataEvent event = (ProcessInstanceVariableDataEvent) data; - try { - ProcessInstanceVariableEventBody body = event.getData(); - ObjectMapper mapper = JsonUtils.getObjectMapper(); - - Map variables = null; - if (pi.getVariables() == null) { - variables = new HashMap<>(); - } else { - variables = new HashMap<>(mapper.treeToValue(pi.getVariables(), HashMap.class)); - } - variables.put(body.getVariableName(), body.getVariableValue()); - pi.setVariables(mapper.valueToTree(variables)); - } catch (JsonProcessingException e) { - LOGGER.error("error during unmarshalling variable instance", e); - } catch (IllegalArgumentException e) { - LOGGER.error("error during merging variable instance event", e); - } + ProcessInstanceVariableEventBody body = event.getData(); + pi.setVariables(JsonUtils.mergeVariable(body.getVariableName(), body.getVariableValue(), pi.getVariables())); return pi; } } diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java index ffd900462b..5ae222d0b6 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java @@ -38,13 +38,10 @@ import org.kie.kogito.index.jpa.model.ProcessInstanceEntity; import org.kie.kogito.index.jpa.model.ProcessInstanceEntityRepository; import org.kie.kogito.index.jpa.model.ProcessInstanceErrorEntity; +import org.kie.kogito.index.json.JsonUtils; import org.kie.kogito.index.model.MilestoneStatus; import org.kie.kogito.index.model.ProcessInstance; import org.kie.kogito.index.storage.ProcessInstanceStorage; -import org.kie.kogito.jackson.utils.JsonObjectUtils; -import org.kie.kogito.jackson.utils.ObjectMapperFactory; - -import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; @@ -203,13 +200,8 @@ private void indexState(ProcessInstanceStateEventBody data, Set addons, private void indexVariable(ProcessInstanceVariableEventBody data) { ProcessInstanceEntity pi = findOrInit(data.getProcessId(), data.getProcessInstanceId()); - ObjectNode node = pi.getVariables(); - if (node == null) { - node = ObjectMapperFactory.get().createObjectNode(); - } - node.set(data.getVariableName(), JsonObjectUtils.fromValue(data.getVariableValue())); - // Object node is not tracked, need explicit set - pi.setVariables(node); + pi.setVariables(JsonUtils.mergeVariable(data.getVariableName(), data.getVariableValue(), pi.getVariables())); repository.flush(); } + } From 9181c76c4b70454cb5037a02c7aa6e00dd8ccc6d Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:11:20 +0100 Subject: [PATCH 09/20] [Fix_#3405] Using merge in all cases (#1990) --- .../index/jpa/storage/AbstractStorage.java | 17 +------- .../ProcessDefinitionEntityStorage.java | 41 +------------------ 2 files changed, 2 insertions(+), 56 deletions(-) diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java index 4d339888e3..de426fc4ef 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/AbstractStorage.java @@ -18,7 +18,6 @@ */ package org.kie.kogito.index.jpa.storage; -import java.util.ConcurrentModificationException; import java.util.Map; import java.util.function.Function; @@ -27,8 +26,6 @@ import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; -import jakarta.persistence.LockModeType; -import jakarta.persistence.PersistenceException; import jakarta.transaction.Transactional; import static java.util.stream.Collectors.toMap; @@ -54,19 +51,7 @@ protected AbstractStorage(PanacheRepositoryBase repository, Class model @Override @Transactional public V put(K key, V value) { - //Pessimistic lock is used to lock the row to handle concurrency with an exiting registry - E persistedEntity = repository.findById(key, LockModeType.PESSIMISTIC_WRITE); - E newEntity = mapToEntity.apply(value); - if (persistedEntity != null) { - repository.getEntityManager().merge(newEntity); - } else { - try { - //to handle concurrency in case of a new registry persist flush and throw an exception to allow retry on the caller side - repository.persistAndFlush(newEntity); - } catch (PersistenceException e) { - throw new ConcurrentModificationException(e); - } - } + repository.getEntityManager().merge(mapToEntity.apply(value)); return value; } diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java index db641e4de5..e22670c665 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessDefinitionEntityStorage.java @@ -18,20 +18,14 @@ */ package org.kie.kogito.index.jpa.storage; -import java.util.Optional; - import org.kie.kogito.index.jpa.mapper.ProcessDefinitionEntityMapper; import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity; import org.kie.kogito.index.jpa.model.ProcessDefinitionEntityRepository; import org.kie.kogito.index.model.ProcessDefinition; import org.kie.kogito.index.model.ProcessDefinitionKey; -import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; - import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import jakarta.persistence.EntityManager; -import jakarta.persistence.LockModeType; import jakarta.transaction.Transactional; @ApplicationScoped @@ -42,7 +36,7 @@ protected ProcessDefinitionEntityStorage() { @Inject public ProcessDefinitionEntityStorage(ProcessDefinitionEntityRepository repository, ProcessDefinitionEntityMapper mapper) { - super(new RepositoryAdapter(repository), ProcessDefinition.class, ProcessDefinitionEntity.class, mapper::mapToModel, mapper::mapToEntity, e -> new ProcessDefinitionKey(e.getId(), + super(repository, ProcessDefinition.class, ProcessDefinitionEntity.class, mapper::mapToModel, mapper::mapToEntity, e -> new ProcessDefinitionKey(e.getId(), e.getVersion())); } @@ -52,37 +46,4 @@ public boolean containsKey(ProcessDefinitionKey key) { return getRepository().count("id = ?1 and version = ?2", key.getId(), key.getVersion()) == 1; } - public static class RepositoryAdapter implements PanacheRepositoryBase { - - ProcessDefinitionEntityRepository repository; - - public RepositoryAdapter(ProcessDefinitionEntityRepository repository) { - this.repository = repository; - } - - @Override - public boolean deleteById(ProcessDefinitionKey key) { - return repository.deleteById(key); - } - - @Override - public Optional findByIdOptional(ProcessDefinitionKey key) { - return repository.findByIdOptional(key); - } - - @Override - public ProcessDefinitionEntity findById(ProcessDefinitionKey s, LockModeType lockModeType) { - return repository.findById(s, lockModeType); - } - - @Override - public void persist(ProcessDefinitionEntity entity) { - repository.persist(entity); - } - - @Override - public EntityManager getEntityManager() { - return repository.getEntityManager(); - } - } } From bbb44211f3bc731e8bf45ebb28f041ea14d5bb57 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Tue, 20 Feb 2024 16:28:33 +0100 Subject: [PATCH 10/20] [Fix #1993] Removing log level setup from application.properties (#1994) --- .../src/main/resources/application.properties | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties index ac4d1958d9..10ce0cd969 100644 --- a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties +++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties @@ -39,9 +39,3 @@ quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.C quarkus.container-image.build=${quarkus.build.image:true} quarkus.container-image.group=org.kie.kogito quarkus.jib.jvm-arguments=-Dquarkus.http.port=8080 - -quarkus.log.console.enable=true -quarkus.log.console.level=INFO -quarkus.log.level=INFO -quarkus.log.category."org.kie.kogito.index".level=INFO -quarkus.log.category."org.kie.kogito.index".min-level=INFO From 3ea553668681ef90518176d8464743c3260f4fa6 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:33:54 +0100 Subject: [PATCH 11/20] [Fix #1995] Setting last update when pi is created (#1996) --- .../ProcessInstanceErrorDataEventMerger.java | 2 +- .../storage/merger/ProcessInstanceEventMerger.java | 5 ++++- .../merger/ProcessInstanceNodeDataEventMerger.java | 2 +- .../ProcessInstanceStateDataEventMerger.java | 2 +- .../ProcessInstanceVariableDataEventMerger.java | 7 +------ .../jpa/storage/ProcessInstanceEntityStorage.java | 14 ++++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java index 6466c4e719..87b6566433 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java @@ -30,8 +30,8 @@ public class ProcessInstanceErrorDataEventMerger extends ProcessInstanceEventMer @Override public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent data) { - pi = getOrNew(pi, data); ProcessInstanceErrorDataEvent event = (ProcessInstanceErrorDataEvent) data; + pi = getOrNew(pi, data, event.getData().getEventDate()); ProcessInstanceError error = new ProcessInstanceError(); error.setMessage(event.getData().getErrorMessage()); error.setNodeDefinitionId(event.getData().getNodeDefinitionId()); diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceEventMerger.java index 7da0072eb1..440d4d6c1a 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceEventMerger.java @@ -19,17 +19,20 @@ package org.kie.kogito.index.storage.merger; import java.util.ArrayList; +import java.util.Date; import org.kie.kogito.event.process.ProcessInstanceDataEvent; +import org.kie.kogito.index.DateTimeUtils; import org.kie.kogito.index.model.ProcessInstance; public abstract class ProcessInstanceEventMerger implements Merger, ProcessInstance> { - protected ProcessInstance getOrNew(ProcessInstance pi, ProcessInstanceDataEvent event) { + protected ProcessInstance getOrNew(ProcessInstance pi, ProcessInstanceDataEvent event, Date date) { if (pi == null) { pi = new ProcessInstance(); pi.setId(event.getKogitoProcessInstanceId()); pi.setProcessId(event.getKogitoProcessId()); + pi.setLastUpdate(DateTimeUtils.toZonedDateTime(date)); pi.setMilestones(new ArrayList<>()); pi.setNodes(new ArrayList<>()); } diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java index f3442d24b9..d800dfd226 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java @@ -47,8 +47,8 @@ public class ProcessInstanceNodeDataEventMerger extends ProcessInstanceEventMerg @Override public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent data) { - pi = getOrNew(pi, data); ProcessInstanceNodeDataEvent event = (ProcessInstanceNodeDataEvent) data; + pi = getOrNew(pi, data, event.getData().getEventDate()); List nodeInstances = Optional.ofNullable(pi.getNodes()).orElse(new ArrayList<>()); diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceStateDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceStateDataEventMerger.java index db80965403..b49036fb0c 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceStateDataEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceStateDataEventMerger.java @@ -39,8 +39,8 @@ public class ProcessInstanceStateDataEventMerger extends ProcessInstanceEventMer @Override public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent data) { - pi = getOrNew(pi, data); ProcessInstanceStateDataEvent event = (ProcessInstanceStateDataEvent) data; + pi = getOrNew(pi, data, event.getData().getEventDate()); LOGGER.debug("Value before merging: {}", pi); pi.setId(event.getData().getProcessInstanceId()); pi.setVersion(event.getData().getProcessVersion()); diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java index d6102ec7b4..b536a15f08 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceVariableDataEventMerger.java @@ -23,22 +23,17 @@ import org.kie.kogito.event.process.ProcessInstanceVariableEventBody; import org.kie.kogito.index.json.JsonUtils; import org.kie.kogito.index.model.ProcessInstance; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ProcessInstanceVariableDataEventMerger extends ProcessInstanceEventMerger { - private static final Logger LOGGER = LoggerFactory.getLogger(ProcessInstanceVariableDataEventMerger.class); - - @SuppressWarnings("unchecked") @Override public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent data) { - pi = getOrNew(pi, data); ProcessInstanceVariableDataEvent event = (ProcessInstanceVariableDataEvent) data; ProcessInstanceVariableEventBody body = event.getData(); + pi = getOrNew(pi, data, body.getEventDate()); pi.setVariables(JsonUtils.mergeVariable(body.getVariableName(), body.getVariableValue(), pi.getVariables())); return pi; } diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java index 5ae222d0b6..5ea98dda39 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java @@ -20,6 +20,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.Set; import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent; @@ -93,11 +94,12 @@ public void indexVariable(ProcessInstanceVariableDataEvent event) { indexVariable(event.getData()); } - private ProcessInstanceEntity findOrInit(String processId, String processInstanceId) { + private ProcessInstanceEntity findOrInit(String processId, String processInstanceId, Date date) { return repository.findByIdOptional(processInstanceId).orElseGet(() -> { ProcessInstanceEntity pi = new ProcessInstanceEntity(); pi.setProcessId(processId); pi.setId(processInstanceId); + pi.setLastUpdate(toZonedDateTime(date)); pi.setNodes(new ArrayList<>()); pi.setMilestones(new ArrayList<>()); repository.persist(pi); @@ -106,7 +108,7 @@ private ProcessInstanceEntity findOrInit(String processId, String processInstanc } private void indexError(ProcessInstanceErrorEventBody error) { - ProcessInstanceEntity pi = findOrInit(error.getProcessId(), error.getProcessInstanceId()); + ProcessInstanceEntity pi = findOrInit(error.getProcessId(), error.getProcessInstanceId(), error.getEventDate()); ProcessInstanceErrorEntity errorEntity = pi.getError(); if (errorEntity == null) { errorEntity = new ProcessInstanceErrorEntity(); @@ -118,7 +120,7 @@ private void indexError(ProcessInstanceErrorEventBody error) { } private void indexNode(ProcessInstanceNodeEventBody data) { - ProcessInstanceEntity pi = findOrInit(data.getProcessId(), data.getProcessInstanceId()); + ProcessInstanceEntity pi = findOrInit(data.getProcessId(), data.getProcessInstanceId(), data.getEventDate()); pi.getNodes().stream().filter(n -> n.getId().equals(data.getNodeInstanceId())).findAny().ifPresentOrElse(n -> updateNode(n, data), () -> createNode(pi, data)); if ("MilestoneNode".equals(data.getNodeType())) { pi.getMilestones().stream().filter(n -> n.getId().equals(data.getNodeInstanceId())).findAny().ifPresentOrElse(n -> updateMilestone(n, data), () -> createMilestone(pi, data)); @@ -171,12 +173,12 @@ private NodeInstanceEntity updateNode(NodeInstanceEntity nodeInstance, ProcessIn } private void indexSLA(ProcessInstanceSLAEventBody data) { - findOrInit(data.getProcessId(), data.getProcessInstanceId()); + findOrInit(data.getProcessId(), data.getProcessInstanceId(), data.getEventDate()); repository.flush(); } private void indexState(ProcessInstanceStateEventBody data, Set addons, String endpoint) { - ProcessInstanceEntity pi = findOrInit(data.getProcessId(), data.getProcessInstanceId()); + ProcessInstanceEntity pi = findOrInit(data.getProcessId(), data.getProcessInstanceId(), data.getEventDate()); pi.setVersion(data.getProcessVersion()); pi.setProcessName(data.getProcessName()); pi.setRootProcessInstanceId(data.getRootProcessInstanceId()); @@ -199,7 +201,7 @@ private void indexState(ProcessInstanceStateEventBody data, Set addons, } private void indexVariable(ProcessInstanceVariableEventBody data) { - ProcessInstanceEntity pi = findOrInit(data.getProcessId(), data.getProcessInstanceId()); + ProcessInstanceEntity pi = findOrInit(data.getProcessId(), data.getProcessInstanceId(), data.getEventDate()); pi.setVariables(JsonUtils.mergeVariable(data.getVariableName(), data.getVariableValue(), pi.getVariables())); repository.flush(); } From 03e2b6e61a76db3d484d2f97300d4a8335522c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Fri, 23 Feb 2024 15:50:29 +0100 Subject: [PATCH 12/20] incubator-kie-issues#932: Rename Quarkus Extension in `kogito-apps` (#1997) * incubator-kie-issues#932: Rename Quarkus Extension in `kogito-apps` * - renamed `job-service` addons, `jbpm-quarkus-devui` & `sonataflow-quarkus-devui` * - renamed `data-audit` addons --- .husky/pre-commit | 0 .../pom.xml | 2 +- data-audit/README.md | 10 +- data-audit/data-audit-quarkus-service/pom.xml | 4 +- .../data-audit-quarkus-jpa-service/pom.xml | 6 +- .../pom.xml | 2 +- .../pom.xml | 7 +- .../pom.xml | 8 +- .../kogito-addons-data-audit-jpa/pom.xml | 2 + .../kogito-addons-data-audit-quarkus/pom.xml | 8 +- .../pom.xml | 7 +- .../deployment/pom.xml | 4 +- .../pom.xml | 2 +- .../runtime/pom.xml | 2 +- .../deployment/pom.xml | 6 +- .../integration-tests-process/pom.xml | 6 +- .../integration-tests-sw/pom.xml | 6 +- .../pom.xml | 2 +- .../runtime/pom.xml | 4 +- .../deployment/pom.xml | 6 +- .../integration-tests-process/pom.xml | 6 +- .../integration-tests-sw/pom.xml | 6 +- .../pom.xml | 2 +- .../runtime/pom.xml | 4 +- .../deployment/pom.xml | 6 +- .../integration-tests-process/pom.xml | 6 +- .../integration-tests-sw/pom.xml | 6 +- .../pom.xml | 2 +- .../runtime/pom.xml | 4 +- .../pom.xml | 2 + .../deployment/pom.xml | 6 +- .../pom.xml | 2 +- .../runtime/pom.xml | 4 +- .../deployment/pom.xml | 8 +- .../integration-tests-process/pom.xml | 6 +- .../integration-tests-sw/pom.xml | 14 +- .../pom.xml | 2 +- .../runtime/pom.xml | 6 +- .../deployment/pom.xml | 6 +- .../integration-tests-process/pom.xml | 6 +- .../integration-tests-sw/pom.xml | 6 +- .../pom.xml | 2 +- .../runtime/pom.xml | 4 +- .../deployment/pom.xml | 8 +- .../integration-tests-process/pom.xml | 6 +- .../integration-tests-sw/pom.xml | 6 +- .../pom.xml | 2 +- .../runtime/pom.xml | 6 +- .../deployment/pom.xml | 8 +- .../integration-tests-process/pom.xml | 6 +- .../integration-tests-sw/pom.xml | 6 +- .../pom.xml | 2 +- .../runtime/pom.xml | 6 +- .../kogito-addons-quarkus-data-index/pom.xml | 2 + .../job-http-recipient/deployment/pom.xml | 12 +- .../job-http-recipient/pom.xml | 6 +- .../job-http-recipient/runtime/pom.xml | 8 +- .../job-sink-recipient/deployment/pom.xml | 13 +- .../job-sink-recipient/pom.xml | 5 +- .../job-sink-recipient/runtime/pom.xml | 8 +- jobs-service/jobs-service-common/pom.xml | 8 +- .../deployment/pom.xml | 10 +- .../pom.xml | 4 +- .../runtime/pom.xml | 8 +- .../kogito-addons-quarkus-jobs/pom.xml | 4 +- .../kogito-addons-jobs-service/pom.xml | 2 + jobs-service/pom.xml | 18 +-- kogito-apps-bom/pom.xml | 141 ++++++++++++------ .../pom.xml | 12 +- .../pom.xml | 8 +- .../pom.xml | 5 +- .../pom.xml | 5 +- .../pom.xml | 12 +- .../runtime-tools-quarkus-extension/pom.xml | 10 +- 74 files changed, 316 insertions(+), 251 deletions(-) mode change 100755 => 100644 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit old mode 100755 new mode 100644 diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml index 4d304aee63..8324e9fcc0 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml @@ -34,7 +34,7 @@ - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-service-embedded diff --git a/data-audit/README.md b/data-audit/README.md index a137058a37..4e323cb9f8 100644 --- a/data-audit/README.md +++ b/data-audit/README.md @@ -93,13 +93,13 @@ org.kie.kogito.app.audit.spi.GraphQLSchemaQueryProvider: this allow the subsyste You need to add two different dependencies to your project (collocated service) - org.kie.kogito - kogito-addons-data-audit- + org.kie + kogito-addons--data-audit ${version} - org.kie.kogito - kogito-addons-data-audit-jpa- + org.kie + kogito-addons--data-audit-jpa ${version} @@ -114,5 +114,5 @@ Each implementation might require additional dependencies. In our case for using quarkus-jdbc-h2 -No additional configuration is requires besides the default datasource use by the application already. +No additional configuration is required besides the default datasource use by the application already. diff --git a/data-audit/data-audit-quarkus-service/pom.xml b/data-audit/data-audit-quarkus-service/pom.xml index 100c84c385..2744fd74b2 100644 --- a/data-audit/data-audit-quarkus-service/pom.xml +++ b/data-audit/data-audit-quarkus-service/pom.xml @@ -26,8 +26,8 @@ data-audit-common-service - org.kie.kogito - kogito-addons-data-audit-quarkus + org.kie + kogito-addons-quarkus-data-audit org.kie.kogito diff --git a/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml b/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml index d34150ab7c..4bc72e655f 100644 --- a/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml +++ b/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml @@ -5,7 +5,7 @@ 4.0.0 kogito-addons-data-audit-jpa - org.kie.kogito + org.kie 999-SNAPSHOT @@ -25,8 +25,8 @@ - org.kie.kogito - kogito-addons-data-audit-jpa-quarkus + org.kie + kogito-addons-quarkus-data-audit-jpa diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/pom.xml b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/pom.xml index 35312a2c2b..66545078e5 100644 --- a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/pom.xml +++ b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-data-audit-jpa 999-SNAPSHOT diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml index 9529ca01b0..399b092b3d 100644 --- a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml +++ b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml @@ -4,12 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.kie kogito-addons-data-audit-jpa - org.kie.kogito 999-SNAPSHOT - kogito-addons-data-audit-jpa-quarkus + org.kie + kogito-addons-quarkus-data-audit-jpa Kogito Apps :: Data Audit :: JPA :: Quarkus @@ -21,7 +22,7 @@ - org.kie.kogito + org.kie kogito-addons-data-audit-jpa-common diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-springboot/pom.xml b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-springboot/pom.xml index d3f5204c18..111ab46888 100644 --- a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-springboot/pom.xml +++ b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-springboot/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.kie kogito-addons-data-audit-jpa - org.kie.kogito 999-SNAPSHOT - - kogito-addons-data-audit-jpa-springboot + org.kie + kogito-addons-springboot-data-audit-jpa Kogito Apps :: Data Audit :: JPA :: SpringBoot @@ -24,7 +24,7 @@ data-audit-common - org.kie.kogito + org.kie kogito-addons-data-audit-jpa-common diff --git a/data-audit/kogito-addons-data-audit-jpa/pom.xml b/data-audit/kogito-addons-data-audit-jpa/pom.xml index 1f7e867c75..8e9a5fb802 100644 --- a/data-audit/kogito-addons-data-audit-jpa/pom.xml +++ b/data-audit/kogito-addons-data-audit-jpa/pom.xml @@ -10,6 +10,8 @@ pom + + org.kie kogito-addons-data-audit-jpa Kogito Apps :: Data Audit :: JPA diff --git a/data-audit/kogito-addons-data-audit-quarkus/pom.xml b/data-audit/kogito-addons-data-audit-quarkus/pom.xml index aa46eb153d..4bebd27896 100644 --- a/data-audit/kogito-addons-data-audit-quarkus/pom.xml +++ b/data-audit/kogito-addons-data-audit-quarkus/pom.xml @@ -9,8 +9,8 @@ 999-SNAPSHOT - kogito-addons-data-audit-quarkus - + org.kie + kogito-addons-quarkus-data-audit Kogito Apps :: Data Audit :: Quarkus @@ -114,8 +114,8 @@ - org.kie.kogito - kogito-addons-data-audit-jpa-quarkus + org.kie + kogito-addons-quarkus-data-audit-jpa test diff --git a/data-audit/kogito-addons-data-audit-springboot/pom.xml b/data-audit/kogito-addons-data-audit-springboot/pom.xml index cb1258b40b..762fad23c2 100644 --- a/data-audit/kogito-addons-data-audit-springboot/pom.xml +++ b/data-audit/kogito-addons-data-audit-springboot/pom.xml @@ -9,7 +9,8 @@ 999-SNAPSHOT - kogito-addons-data-audit-springboot + org.kie + kogito-addons-springboot-data-audit Kogito Apps :: Data Audit :: SpringBoot @@ -73,8 +74,8 @@ - org.kie.kogito - kogito-addons-data-audit-jpa-springboot + org.kie + kogito-addons-springboot-data-audit-jpa diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml index a3fd489c22..e1c7ba7fc4 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-parent 999-SNAPSHOT @@ -43,7 +43,7 @@ kogito-addons-quarkus-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-runtime diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml index 3a0d414097..690ce9668f 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml index 5b608d2e7c..0d0ee45849 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml @@ -24,7 +24,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-parent 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml index 0a63c1c734..6542f22985 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan-parent 999-SNAPSHOT @@ -31,11 +31,11 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Persistence Infinispan :: Deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml index caac1b2a61..df01842c38 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan @@ -67,7 +67,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml index 9499b8c3c0..e5315e248d 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan @@ -72,7 +72,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml index 950991eccd..f89c056c5f 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml index 28cb71c89f..e967805e02 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan-parent 999-SNAPSHOT @@ -31,7 +31,7 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Persistence Infinispan :: Runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-runtime diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml index f5a9fe9cab..121176e1fd 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb-parent 999-SNAPSHOT @@ -31,11 +31,11 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Persistence MongoDB :: Deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml index e7c86409f1..dbbb844579 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb-parent 999-SNAPSHOT @@ -48,7 +48,7 @@ kogito-addons-quarkus-persistence-mongodb - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb @@ -67,7 +67,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml index 72893b296d..e8c3073291 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb-parent 999-SNAPSHOT @@ -48,7 +48,7 @@ kogito-addons-quarkus-persistence-mongodb - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb @@ -72,7 +72,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml index d5a3b6d821..c3f62cb5f2 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml index 8972d5ec7a..5c6b565665 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb-parent 999-SNAPSHOT @@ -31,7 +31,7 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Persistence MongoDB :: Runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-runtime diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml index a1b449fad0..197d5d3f13 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql-parent 999-SNAPSHOT @@ -31,11 +31,11 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Persistence PostgreSQL :: Deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml index aa3da6893b..db3ae5ad1f 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql @@ -65,7 +65,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml index 1176f5ae29..c9b77d9c27 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql @@ -78,7 +78,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml index 534c37123a..4b084a1c94 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml index 64fbb5bc50..edcce3089d 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql-parent 999-SNAPSHOT @@ -31,7 +31,7 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Persistence PostgreSQL :: Runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-runtime diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml index a50d704971..d4cb56a63f 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml @@ -27,6 +27,8 @@ data-index 999-SNAPSHOT + + org.kie kogito-addons-quarkus-data-index-persistence Kogito Apps :: Kogito Addons Quarkus Data Index Persistence pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml index c347c653dc..359e2a8d34 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-parent 999-SNAPSHOT @@ -39,7 +39,7 @@ kogito-addons-quarkus-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-deployment @@ -47,7 +47,7 @@ quarkus-smallrye-fault-tolerance-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-runtime diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml index 5b53d3ec54..ae5a4387cc 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml index 296e29d909..5d51ababa0 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml @@ -24,7 +24,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-parent 999-SNAPSHOT @@ -40,7 +40,7 @@ data-index-graphql - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-common-runtime diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml index 954aff2e84..51a2f3cd25 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan-parent 999-SNAPSHOT @@ -31,15 +31,15 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Infinispan :: Deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml index db6ec11c48..eed45f8d99 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan @@ -66,7 +66,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml index 049b332e3c..00767744a2 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan @@ -52,13 +52,13 @@ kogito-addons-quarkus-persistence-infinispan - org.kie.kogito - kogito-quarkus-serverless-workflow-devui + org.sonataflow + sonataflow-quarkus-devui - org.kie.kogito - kogito-quarkus-serverless-workflow-devui-deployment + org.sonataflow + sonataflow-quarkus-devui-deployment ${project.version} pom test @@ -80,7 +80,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml index 7ac2d09e24..42f2e9c549 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml index 4a72edac22..5c361b575c 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-infinispan-parent 999-SNAPSHOT @@ -31,11 +31,11 @@ Kogito Apps :: Kogito Addons Quarkus Data Index Infinispan :: Runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-infinispan diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml index 0dcdd353e2..5557427def 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory-parent 999-SNAPSHOT @@ -31,11 +31,11 @@ Kogito Apps :: Kogito Addons Quarkus Data Index In-memory :: Deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml index ca60d8cc4a..1426ab9296 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory @@ -62,7 +62,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml index 6351fef36e..2561c48a11 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory @@ -58,7 +58,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml index 0f6a0b62bb..92855b0b45 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml index 0afc977c9e..737e73f30f 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-inmemory-parent 999-SNAPSHOT @@ -31,7 +31,7 @@ Kogito Apps :: Kogito Addons Quarkus Data Index In-memory :: Runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-runtime diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml index 85d2a897bd..e9bf591d49 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb-parent 999-SNAPSHOT @@ -31,15 +31,15 @@ Kogito Apps :: Kogito Addons Quarkus Data Index MongoDB :: Deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml index bfb73aeaa3..69535b756f 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb-parent 999-SNAPSHOT @@ -48,7 +48,7 @@ kogito-addons-quarkus-persistence-mongodb - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb @@ -66,7 +66,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml index 8090b922d5..366b3038b9 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb-parent 999-SNAPSHOT @@ -48,7 +48,7 @@ kogito-addons-quarkus-persistence-mongodb - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb @@ -62,7 +62,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml index 4837e90517..d26fe089ed 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml index 048a0b2580..bba0e6e3c5 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-mongodb-parent 999-SNAPSHOT @@ -31,11 +31,11 @@ Kogito Apps :: Kogito Addons Quarkus Data Index MongoDB :: Runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-mongodb diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml index 098e64e0e5..434a514962 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql-parent 999-SNAPSHOT @@ -31,15 +31,15 @@ Kogito Apps :: Kogito Addons Quarkus Data Index PostgreSQL :: Deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml index 6cfd8c75ca..fd1933cca9 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql @@ -74,7 +74,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml index 9d58ee647c..f617c12cad 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql-parent 999-SNAPSHOT @@ -44,7 +44,7 @@ quarkus-resteasy-jackson - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql @@ -70,7 +70,7 @@ test - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml index df80ccf45c..226d365822 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index 999-SNAPSHOT diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml index 25ea209962..91e7c8d0a4 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-postgresql-parent 999-SNAPSHOT @@ -31,11 +31,11 @@ Kogito Apps :: Kogito Addons Quarkus Data Index PostgreSQL :: Runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-runtime - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-persistence-postgresql diff --git a/data-index/kogito-addons-quarkus-data-index/pom.xml b/data-index/kogito-addons-quarkus-data-index/pom.xml index ba51ba6cdb..2996e9027a 100644 --- a/data-index/kogito-addons-quarkus-data-index/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/pom.xml @@ -27,6 +27,8 @@ data-index 999-SNAPSHOT + + org.kie kogito-addons-quarkus-data-index Kogito Apps :: Kogito Addons Quarkus Data Index pom diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml index 8764590228..9d66b1c5d7 100644 --- a/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml +++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml @@ -23,20 +23,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito - job-http-recipient-parent + org.kie + kogito-addons-quarkus-job-http-recipient-parent 999-SNAPSHOT - job-http-recipient-deployment - Kogito Apps :: Jobs Service :: Job Http Recipient - Deployment + kogito-addons-quarkus-job-http-recipient-deployment + Kogito Apps :: Jobs Service :: Kogito Add-Ons Quarkus Job Http Recipient - Deployment io.quarkus quarkus-arc-deployment - org.kie.kogito - job-http-recipient + org.kie + kogito-addons-quarkus-job-http-recipient io.quarkus diff --git a/jobs-service/jobs-recipients/job-http-recipient/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/pom.xml index 4c38e877d1..8e8214f306 100644 --- a/jobs-service/jobs-recipients/job-http-recipient/pom.xml +++ b/jobs-service/jobs-recipients/job-http-recipient/pom.xml @@ -27,9 +27,11 @@ jobs-recipients 999-SNAPSHOT - job-http-recipient-parent + + org.kie + kogito-addons-quarkus-job-http-recipient-parent pom - Kogito Apps :: Jobs Service :: Job Http Recipient - Parent + Kogito Apps :: Jobs Service :: Kogito Add-Ons Quarkus Job Http Recipient - Parent org.kie.kogito.job.recipient.http.extension 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 ead0946c49..1605df80c0 100644 --- a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml +++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml @@ -23,12 +23,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito - job-http-recipient-parent + org.kie + kogito-addons-quarkus-job-http-recipient-parent 999-SNAPSHOT - job-http-recipient - Kogito Apps :: Jobs Service :: Job Http Recipient - Runtime + kogito-addons-quarkus-job-http-recipient + Kogito Apps :: Jobs Service :: Kogito Add-Ons Quarkus Job Http Recipient - Runtime io.quarkus diff --git a/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml index 22258b22d8..be9e71b4c6 100644 --- a/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml +++ b/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml @@ -23,13 +23,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - job-sink-recipient-parent - org.kie.kogito + org.kie + kogito-addons-quarkus-job-sink-recipient-parent 999-SNAPSHOT 4.0.0 - job-sink-recipient-deployment - Kogito Apps :: Jobs Service :: Job Sink Recipient - Deployment + kogito-addons-quarkus-job-sink-recipient-deployment + Kogito Apps :: Jobs Service :: Kogito Add-Ons Quarkus Job Sink Recipient - Deployment @@ -45,9 +45,10 @@ quarkus-jackson-deployment - org.kie.kogito - job-sink-recipient + org.kie + kogito-addons-quarkus-job-sink-recipient + org.junit.jupiter diff --git a/jobs-service/jobs-recipients/job-sink-recipient/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/pom.xml index 449cbde24e..3ba1e39129 100644 --- a/jobs-service/jobs-recipients/job-sink-recipient/pom.xml +++ b/jobs-service/jobs-recipients/job-sink-recipient/pom.xml @@ -29,9 +29,10 @@ 4.0.0 - job-sink-recipient-parent + org.kie + kogito-addons-quarkus-job-sink-recipient-parent pom - Kogito Apps :: Jobs Service :: Job Sink Recipient - Parent + Kogito Apps :: Jobs Service :: Kogito Add-Ons Quarkus Job Sink Recipient - Parent org.kie.kogito.job.recipient.sink.extension 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 599dca7be2..79a7ddc30b 100644 --- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml +++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml @@ -23,13 +23,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - job-sink-recipient-parent - org.kie.kogito + org.kie + kogito-addons-quarkus-job-sink-recipient-parent 999-SNAPSHOT 4.0.0 - job-sink-recipient - Kogito Apps :: Jobs Service :: Job Sink Recipient - Runtime + kogito-addons-quarkus-job-sink-recipient + Kogito Apps :: Jobs Service :: Kogito Add-Ons Quarkus Job Sink Recipient - Runtime diff --git a/jobs-service/jobs-service-common/pom.xml b/jobs-service/jobs-service-common/pom.xml index 96163c8780..c1db185e38 100644 --- a/jobs-service/jobs-service-common/pom.xml +++ b/jobs-service/jobs-service-common/pom.xml @@ -54,12 +54,12 @@ jobs-service-internal-api - org.kie.kogito - job-http-recipient + org.kie + kogito-addons-quarkus-job-http-recipient - org.kie.kogito - job-sink-recipient + org.kie + kogito-addons-quarkus-job-sink-recipient io.quarkus diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml index 8fc8d79fa9..e3f3eb4501 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml @@ -23,19 +23,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-service-embedded-parent 999-SNAPSHOT kogito-addons-quarkus-jobs-service-embedded-deployment - Jobs Service Embedded Quarkus Addon - Deployment + Jobs Service Embedded Quarkus Add-On - Deployment io.quarkus quarkus-arc-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-service-embedded @@ -55,8 +55,8 @@ kogito-addons-quarkus-common-deployment - org.kie.kogito - job-http-recipient-deployment + org.kie + kogito-addons-quarkus-job-http-recipient-deployment io.quarkus diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml index 58b9aeafbe..3f6bc0b450 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml @@ -23,13 +23,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-jobs-service 999-SNAPSHOT kogito-addons-quarkus-jobs-service-embedded-parent pom - Jobs Service Embedded Quarkus Addon - Parent + Jobs Service Embedded Quarkus Add-On - Parent org.kie.kogito.addons.quarkus.job.service.embedded diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml index a8f786cca8..58cb0eefda 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml @@ -23,12 +23,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-service-embedded-parent 999-SNAPSHOT kogito-addons-quarkus-jobs-service-embedded - Jobs Service Embedded Quarkus Addon - Runtime + Jobs Service Embedded Quarkus Add-On - Runtime Run Jobs Service embedded with the application. @@ -73,8 +73,8 @@ - org.kie.kogito - job-sink-recipient + org.kie + kogito-addons-quarkus-job-sink-recipient diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml index ed160a6db6..e83e2ecdae 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml @@ -5,13 +5,13 @@ 4.0.0 kogito-addons-jobs-service - org.kie.kogito + org.kie 999-SNAPSHOT kogito-addons-quarkus-jobs - Jobs Collocated Quarkus Addon - Runtime + Jobs Collocated Quarkus Add-On - Runtime Run Jobs Service embedded with the application. diff --git a/jobs-service/kogito-addons-jobs-service/pom.xml b/jobs-service/kogito-addons-jobs-service/pom.xml index 45b2397131..d2dc14e4c2 100644 --- a/jobs-service/kogito-addons-jobs-service/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/pom.xml @@ -28,6 +28,8 @@ jobs-service 999-SNAPSHOT + + org.kie kogito-addons-jobs-service Kogito Apps :: Jobs :: Addons Kogito Jobs Addons Parent diff --git a/jobs-service/pom.xml b/jobs-service/pom.xml index a505ae3031..df5f21f771 100644 --- a/jobs-service/pom.xml +++ b/jobs-service/pom.xml @@ -73,32 +73,32 @@ test - org.kie.kogito - job-http-recipient + org.kie + kogito-addons-quarkus-job-http-recipient ${project.version} - org.kie.kogito - job-http-recipient-deployment + org.kie + kogito-addons-quarkus-job-http-recipient-deployment ${project.version} - org.kie.kogito - job-sink-recipient + org.kie + kogito-addons-quarkus-job-sink-recipient ${project.version} org.kie.kogito - job-sink-recipient-deployment + kogito-addons-quarkus-job-sink-recipient-deployment ${project.version} - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-service-embedded ${project.version} - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-service-embedded-deployment ${project.version} diff --git a/kogito-apps-bom/pom.xml b/kogito-apps-bom/pom.xml index 9e66235c59..9af9eb69a9 100644 --- a/kogito-apps-bom/pom.xml +++ b/kogito-apps-bom/pom.xml @@ -125,54 +125,77 @@ sources - org.kie.kogito + org.kie kogito-addons-quarkus-jobs ${project.version} - org.kie.kogito + org.kie kogito-addons-quarkus-jobs ${project.version} sources - - org.kie.kogito - data-audit-common + org.kie + kogito-addons-quarkus-job-http-recipient-deployment ${project.version} - org.kie.kogito - data-audit-common + org.kie + kogito-addons-quarkus-job-http-recipient-deployment ${project.version} - tests + sources - org.kie.kogito - data-audit-common-service + org.kie + kogito-addons-quarkus-job-http-recipient ${project.version} - org.kie.kogito - data-audit-quarkus-tck + org.kie + kogito-addons-quarkus-job-http-recipient + ${project.version} + sources + + + org.kie + kogito-addons-quarkus-job-sink-recipient-deployment + ${project.version} + + + org.kie + kogito-addons-quarkus-job-sink-recipient-deployment ${project.version} + sources + + org.kie + kogito-addons-quarkus-job-sink-recipient + ${project.version} + + + org.kie + kogito-addons-quarkus-job-sink-recipient + ${project.version} + sources + + + org.kie.kogito - data-audit-quarkus-tck + data-audit-common ${project.version} - test-jar org.kie.kogito - data-audit-springboot-tck + data-audit-common ${project.version} + tests org.kie.kogito - data-audit-springboot-tck + data-audit-common-service ${project.version} - test-jar org.kie.kogito @@ -180,29 +203,34 @@ ${project.version} - org.kie.kogito - kogito-addons-data-audit-quarkus + org.kie + kogito-addons-quarkus-data-audit ${project.version} - org.kie.kogito - kogito-addons-data-audit-springboot + org.kie + kogito-addons-springboot-data-audit ${project.version} - org.kie.kogito + org.kie + data-audit-quarkus-jpa-service + ${project.version} + + + org.kie kogito-addons-data-audit-jpa-common ${project.version} - org.kie.kogito - kogito-addons-data-audit-jpa-quarkus + org.kie + kogito-addons-quarkus-data-audit-jpa ${project.version} - org.kie.kogito - kogito-addons-data-audit-jpa-springboot + org.kie + kogito-addons-springboot-data-audit-jpa ${project.version} @@ -397,49 +425,45 @@ sources - org.kie.kogito - - kogito-addons-quarkus-data-index-persistence-common-runtime + org.kie + kogito-addons-quarkus-data-index-persistence-common-runtime ${project.version} - org.kie.kogito - - kogito-addons-quarkus-data-index-persistence-common-runtime + org.kie + kogito-addons-quarkus-data-index-persistence-common-runtime ${project.version} sources - org.kie.kogito - - kogito-addons-quarkus-data-index-persistence-common-deployment + org.kie + kogito-addons-quarkus-data-index-persistence-common-deployment ${project.version} - org.kie.kogito - - kogito-addons-quarkus-data-index-persistence-common-deployment + org.kie + kogito-addons-quarkus-data-index-persistence-common-deployment ${project.version} sources - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-runtime ${project.version} - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-runtime ${project.version} sources - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-deployment ${project.version} - org.kie.kogito + org.kie kogito-addons-quarkus-data-index-common-deployment ${project.version} sources @@ -958,15 +982,40 @@ ${project.version} + - org.kie.kogito - runtime-tools-quarkus-extension-deployment + org.jbpm + jbpm-quarkus-devui ${project.version} - org.kie.kogito - runtime-tools-quarkus-extension + org.jbpm + jbpm-quarkus-devui-deployment + ${project.version} + + + + + org.sonataflow + sonataflow-quarkus-devui + ${project.version} + + + org.sonataflow + sonataflow-quarkus-devui ${project.version} + sources + + + org.sonataflow + sonataflow-quarkus-devui-deployment + ${project.version} + + + org.sonataflow + sonataflow-quarkus-devui-deployment + ${project.version} + sources diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml index 39d488086e..1b3bfe13fd 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml @@ -24,13 +24,13 @@ 4.0.0 - org.kie.kogito - kogito-quarkus-serverless-workflow-devui-parent + org.sonataflow + sonataflow-quarkus-devui-parent 999-SNAPSHOT - kogito-quarkus-serverless-workflow-devui-deployment - Kogito Apps :: Serverless Workflow Quarkus Dev UI Extension :: Deployment + sonataflow-quarkus-devui-deployment + Kogito Apps :: SonataFlow Quarkus Dev UI Extension :: Deployment ../../ui-packages/packages/runtime-tools-dev-ui-webapp @@ -90,8 +90,8 @@ test - org.kie.kogito - kogito-quarkus-serverless-workflow-devui + org.sonataflow + sonataflow-quarkus-devui ${project.version} 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 a37a2b3ab0..60428221e0 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 @@ -23,12 +23,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito - kogito-quarkus-serverless-workflow-devui-parent + org.sonataflow + sonataflow-quarkus-devui-parent 999-SNAPSHOT - kogito-quarkus-serverless-workflow-devui - Kogito Apps :: Serverless Workflow Quarkus Dev UI Extension :: Extension + sonataflow-quarkus-devui + Kogito Apps :: SonataFlow Quarkus Dev UI Extension :: Runtime Runtime development tools for Serverless Workflows diff --git a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml index c5491db11a..856ff39912 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml @@ -29,8 +29,9 @@ 4.0.0 - Kogito Apps :: Serverless Workflow Quarkus Dev UI Extension - kogito-quarkus-serverless-workflow-devui-parent + Kogito Apps :: SonataFlow Quarkus Dev UI Extension + org.sonataflow + sonataflow-quarkus-devui-parent pom diff --git a/runtime-tools-quarkus-extension-parent/pom.xml b/runtime-tools-quarkus-extension-parent/pom.xml index d3f32eae2a..96b7ee8362 100644 --- a/runtime-tools-quarkus-extension-parent/pom.xml +++ b/runtime-tools-quarkus-extension-parent/pom.xml @@ -29,8 +29,9 @@ 4.0.0 - Runtime Tools Quarkus Extension - Parent - runtime-tools-quarkus-extension-parent + jBPM Quarkus DevUI - Parent + org.jbpm + jbpm-quarkus-devui-parent pom diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml index c665aa5f7a..f6937b6ed1 100644 --- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml +++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml @@ -24,13 +24,13 @@ 4.0.0 - org.kie.kogito - runtime-tools-quarkus-extension-parent + org.jbpm + jbpm-quarkus-devui-parent 999-SNAPSHOT - runtime-tools-quarkus-extension-deployment - Runtime Tools Quarkus Extension - Deployment + jbpm-quarkus-devui-deployment + jBPM Quarkus DevUI - Deployment ../../ui-packages/packages/runtime-tools-dev-ui-webapp @@ -90,8 +90,8 @@ test - org.kie.kogito - runtime-tools-quarkus-extension + org.jbpm + jbpm-quarkus-devui ${project.version} 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 9079b80044..56f7285b25 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 @@ -23,13 +23,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.kie.kogito - runtime-tools-quarkus-extension-parent + org.jbpm + jbpm-quarkus-devui-parent 999-SNAPSHOT - runtime-tools-quarkus-extension - Runtime Tools Quarkus Extension - Runtime - Runtime development tools for Kogito projects + jbpm-quarkus-devui + jBPM Quarkus DevUI - Runtime + Runtime development tools for jBPM projects From c4f2f2d9df81165869dfd168b5c83d964e0033fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Fri, 23 Feb 2024 17:05:48 +0100 Subject: [PATCH 13/20] incubator-kie-issues#934: Rename the `jBPM` & `drools` Quarkus Extensions in `kogito-runtimes` (#2000) * incubator-kie-issues#934: Rename the `jBPM` & `drools` Quarkus Extensions in `kogito-runtimes` * added missing dep * restore `.husky/pre-commit` --- .../integration-tests-data-index-service-quarkus/pom.xml | 8 ++++---- .../pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../integration-tests-jobs-service-springboot/pom.xml | 4 ++-- .../integration-tests-trusty-service-quarkus/pom.xml | 4 ++-- .../integration-tests-trusty-service-springboot/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- jitexecutor/jitexecutor-bpmn/pom.xml | 4 ++-- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml index 1eed8a595a..a6d1908701 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml @@ -34,16 +34,16 @@ - org.kie.kogito - kogito-quarkus + org.jbpm + jbpm-with-drools-quarkus org.kie.kogito kogito-addons-quarkus-process-management - org.kie.kogito - kogito-addons-quarkus-task-management + org.jbpm + jbpm-addons-quarkus-task-management org.kie.kogito diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml index 63ef8eb11d..ac259643c2 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml @@ -50,8 +50,8 @@ - org.kie.kogito - kogito-spring-boot-starter + org.jbpm + jbpm-with-drools-spring-boot-starter org.kie.kogito @@ -66,8 +66,8 @@ kogito-addons-springboot-process-management - org.kie.kogito - kogito-addons-springboot-task-management + org.jbpm + jbpm-addons-springboot-task-management org.kie.kogito diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml index 8324e9fcc0..a158559bbb 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml @@ -38,8 +38,8 @@ kogito-addons-quarkus-jobs-service-embedded - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus true diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml index 2a4cc602c7..9ce09bbd9b 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml @@ -38,8 +38,8 @@ kogito-addons-quarkus-jobs-knative-eventing - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus org.kie.kogito diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml index d0b8765d74..981abbf475 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml @@ -38,8 +38,8 @@ kogito-addons-quarkus-jobs-management - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus org.kie.kogito diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml index 5865aec33e..d59161637d 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml @@ -38,8 +38,8 @@ kogito-addons-quarkus-jobs-messaging - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus org.kie.kogito diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml index 3367ba036d..96f0e0ecef 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml @@ -48,8 +48,8 @@ - org.kie.kogito - kogito-spring-boot-starter + org.jbpm + jbpm-with-drools-spring-boot-starter org.kie.kogito diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml index 760f3580b7..1cc8ca0bd7 100644 --- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml @@ -36,8 +36,8 @@ - org.kie.kogito - kogito-quarkus + org.jbpm + jbpm-with-drools-quarkus org.kie.kogito diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml index 0008c4e9b7..bdad3c5e78 100644 --- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml @@ -56,8 +56,8 @@ - org.kie.kogito - kogito-spring-boot-starter + org.jbpm + jbpm-with-drools-spring-boot-starter org.kie.kogito diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml index df01842c38..2f3f5fc222 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml index dbbb844579..5cd2d216f1 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml index db3ae5ad1f..9e798a3c48 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml index eed45f8d99..e3bfe9e9b6 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml index 1426ab9296..63c0c0bc55 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml index 69535b756f..03dc482819 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml index fd1933cca9..f94a99123a 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus io.quarkus diff --git a/jitexecutor/jitexecutor-bpmn/pom.xml b/jitexecutor/jitexecutor-bpmn/pom.xml index 00ca9e0713..ba267ce747 100644 --- a/jitexecutor/jitexecutor-bpmn/pom.xml +++ b/jitexecutor/jitexecutor-bpmn/pom.xml @@ -67,8 +67,8 @@ jitexecutor-common - org.kie.kogito - kogito-quarkus-processes + org.jbpm + jbpm-quarkus From dcdbc4aa5669633084ea4f8b9dc68e6015b0ab5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Wed, 28 Feb 2024 17:49:06 +0100 Subject: [PATCH 14/20] incubator-kie-issues#933: Rename `SonataFlow` Quarkus Extensions in `kogito-runtimes` (#2003) * incubator-kie-issues#933: Rename `SonataFlow` Quarkus Extensions in `kogito-runtimes` * change groupId to `org.apache.sonataflow` --- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 8 ++++---- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- kogito-apps-bom/pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../kogito-quarkus-serverless-workflow-devui/pom.xml | 4 ++-- kogito-quarkus-serverless-workflow-devui-parent/pom.xml | 2 +- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml index e12b51c8e3..2581482356 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml @@ -38,8 +38,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml index a158559bbb..00fcd2c6a4 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml @@ -43,8 +43,8 @@ true - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus true diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml index 9ce09bbd9b..9cb3536b15 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml @@ -42,8 +42,8 @@ jbpm-quarkus - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml index 981abbf475..03a91e8704 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml @@ -42,8 +42,8 @@ jbpm-quarkus - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml index d59161637d..365693ce18 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml @@ -42,8 +42,8 @@ jbpm-quarkus - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml index e5315e248d..c43a7b0884 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml index e8c3073291..06e7a255f5 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml index c9b77d9c27..d4e91046d1 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml index 00767744a2..5aac217b70 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus @@ -52,12 +52,12 @@ kogito-addons-quarkus-persistence-infinispan - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml index 2561c48a11..ff59173341 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml index 366b3038b9..2b6468cc67 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml index f617c12cad..6d15e9b879 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.kie.kogito - kogito-quarkus-serverless-workflow + org.apache.sonataflow + sonataflow-quarkus io.quarkus diff --git a/kogito-apps-bom/pom.xml b/kogito-apps-bom/pom.xml index 9af9eb69a9..419e460457 100644 --- a/kogito-apps-bom/pom.xml +++ b/kogito-apps-bom/pom.xml @@ -996,23 +996,23 @@ - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui ${project.version} - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui ${project.version} sources - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui-deployment ${project.version} - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui-deployment ${project.version} sources diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml index 1b3bfe13fd..a7bfaf7333 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml @@ -24,7 +24,7 @@ 4.0.0 - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui-parent 999-SNAPSHOT @@ -90,7 +90,7 @@ test - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui ${project.version} 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 60428221e0..6c20ec023a 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 @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui-parent 999-SNAPSHOT @@ -134,7 +134,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.sonataflow.quarkus.dev-ui + org.apache.sonataflow.quarkus.dev-ui diff --git a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml index 856ff39912..fcb3a3c751 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml @@ -30,7 +30,7 @@ 4.0.0 Kogito Apps :: SonataFlow Quarkus Dev UI Extension - org.sonataflow + org.apache.sonataflow sonataflow-quarkus-devui-parent pom From 526ae0110d8eef881f39db81a29a7723c60f0ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Fri, 1 Mar 2024 14:47:14 +0100 Subject: [PATCH 15/20] =?UTF-8?q?Revert=20"incubator-kie-issues#933:=20Ren?= =?UTF-8?q?ame=20`SonataFlow`=20Quarkus=20Extensions=20in=20`=E2=80=A6"=20?= =?UTF-8?q?(#2007)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e6208f2963cedb1886bbb09fa4335acf5bc1b4ca. --- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 8 ++++---- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- kogito-apps-bom/pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../kogito-quarkus-serverless-workflow-devui/pom.xml | 4 ++-- kogito-quarkus-serverless-workflow-devui-parent/pom.xml | 2 +- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml index 2581482356..e12b51c8e3 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml @@ -38,8 +38,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml index 00fcd2c6a4..a158559bbb 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml @@ -43,8 +43,8 @@ true - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow true diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml index 9cb3536b15..9ce09bbd9b 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml @@ -42,8 +42,8 @@ jbpm-quarkus - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml index 03a91e8704..981abbf475 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml @@ -42,8 +42,8 @@ jbpm-quarkus - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml index 365693ce18..d59161637d 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml @@ -42,8 +42,8 @@ jbpm-quarkus - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml index c43a7b0884..e5315e248d 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml index 06e7a255f5..e8c3073291 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml index d4e91046d1..c9b77d9c27 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml index 5aac217b70..00767744a2 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus @@ -52,12 +52,12 @@ kogito-addons-quarkus-persistence-infinispan - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui-deployment ${project.version} pom diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml index ff59173341..2561c48a11 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml index 2b6468cc67..366b3038b9 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml index 6d15e9b879..f617c12cad 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml @@ -32,8 +32,8 @@ - org.apache.sonataflow - sonataflow-quarkus + org.kie.kogito + kogito-quarkus-serverless-workflow io.quarkus diff --git a/kogito-apps-bom/pom.xml b/kogito-apps-bom/pom.xml index 419e460457..9af9eb69a9 100644 --- a/kogito-apps-bom/pom.xml +++ b/kogito-apps-bom/pom.xml @@ -996,23 +996,23 @@ - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui ${project.version} - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui ${project.version} sources - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui-deployment ${project.version} - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui-deployment ${project.version} sources diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml index a7bfaf7333..1b3bfe13fd 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml @@ -24,7 +24,7 @@ 4.0.0 - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui-parent 999-SNAPSHOT @@ -90,7 +90,7 @@ test - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui ${project.version} 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 6c20ec023a..60428221e0 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 @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui-parent 999-SNAPSHOT @@ -134,7 +134,7 @@ ${project.groupId}:${project.artifactId}-deployment:${project.version} - org.apache.sonataflow.quarkus.dev-ui + org.sonataflow.quarkus.dev-ui diff --git a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml index fcb3a3c751..856ff39912 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml @@ -30,7 +30,7 @@ 4.0.0 Kogito Apps :: SonataFlow Quarkus Dev UI Extension - org.apache.sonataflow + org.sonataflow sonataflow-quarkus-devui-parent pom From 3ced2c18de8602de9bb3f684a467af4a2b666597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Mon, 4 Mar 2024 21:27:27 +0100 Subject: [PATCH 16/20] [NO_ISSUE]: Rollback missing `sonataflow-quarkus-devui` groupId (#2008) * [NO_ISSUE]: Rollback missing `sonataflow-quarkus-devui` groupId * fix devuis --- .../integration-tests-sw/pom.xml | 4 ++-- kogito-apps-bom/pom.xml | 8 ++++---- .../pom.xml | 4 ++-- .../kogito/swf/tools/deployment/DevConsoleProcessor.java | 4 ++-- .../kogito-quarkus-serverless-workflow-devui/pom.xml | 2 +- kogito-quarkus-serverless-workflow-devui-parent/pom.xml | 1 - .../quarkus/extension/deployment/DevConsoleProcessor.java | 6 +++--- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml index 00767744a2..f3cffacf42 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml @@ -52,12 +52,12 @@ kogito-addons-quarkus-persistence-infinispan - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui-deployment ${project.version} pom diff --git a/kogito-apps-bom/pom.xml b/kogito-apps-bom/pom.xml index 9af9eb69a9..5d7488973b 100644 --- a/kogito-apps-bom/pom.xml +++ b/kogito-apps-bom/pom.xml @@ -996,23 +996,23 @@ - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui ${project.version} - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui ${project.version} sources - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui-deployment ${project.version} - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui-deployment ${project.version} sources diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml index 1b3bfe13fd..c17d98976d 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml @@ -24,7 +24,7 @@ 4.0.0 - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui-parent 999-SNAPSHOT @@ -90,7 +90,7 @@ test - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui ${project.version} 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 8c21398e45..1e2dfb81ba 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 @@ -50,7 +50,7 @@ public class DevConsoleProcessor { private static final String STATIC_RESOURCES_PATH = "dev-static/"; - private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow-devui"; + private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.sonataflow-quarkus-devui"; private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index"; @BuildStep(onlyIf = IsDevelopment.class) @@ -93,7 +93,7 @@ public void deployStaticResources(final DevConsoleRecorder recorder, final BuildProducer routeBuildItemBuildProducer) throws IOException { ResolvedDependency devConsoleResourcesArtifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, "org.kie.kogito", - "kogito-quarkus-serverless-workflow-devui-deployment"); + "sonataflow-quarkus-devui-deployment"); Path devConsoleStaticResourcesDeploymentPath = WebJarUtil.copyResourcesForDevOrTest( liveReloadBuildItem, 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 60428221e0..142211b1e9 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 @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.sonataflow + org.kie.kogito sonataflow-quarkus-devui-parent 999-SNAPSHOT diff --git a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml index 856ff39912..2d692e34b0 100644 --- a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml +++ b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml @@ -30,7 +30,6 @@ 4.0.0 Kogito Apps :: SonataFlow Quarkus Dev UI Extension - org.sonataflow sonataflow-quarkus-devui-parent pom 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 a5337babd5..16ae6b4200 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 @@ public class DevConsoleProcessor { private static final String STATIC_RESOURCES_PATH = "dev-static/"; - private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.runtime-tools-quarkus-extension"; + private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.jbpm.jbpm-quarkus-devui"; private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index"; @SuppressWarnings("unused") @@ -66,8 +66,8 @@ public void deployStaticResources(final DevConsoleRecorder recorder, final ShutdownContextBuildItem shutdownContext, final BuildProducer routeBuildItemBuildProducer) throws IOException { ResolvedDependency devConsoleResourcesArtifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, - "org.kie.kogito", - "runtime-tools-quarkus-extension-deployment"); + "org.jbpm", + "jbpm-quarkus-devui-deployment"); Path devConsoleStaticResourcesDeploymentPath = WebJarUtil.copyResourcesForDevOrTest( liveReloadBuildItem, From ed56272e313d4816b47ae8f4500dd5cacf91ebe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Thu, 7 Mar 2024 09:47:37 +0100 Subject: [PATCH 17/20] incubator-kie-issues#935: Rename `kie` & `kogito` Quarkus Extensions in `kogito-runtimes` (#2006) * incubator-kie-issues#935: Rename `kie` & `kogito` Quarkus Extensions in `kogito-runtimes` * fix missing dependencies --- .../pom.xml | 20 +++++++++---------- .../pom.xml | 16 +++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 2 +- .../pom.xml | 6 +++--- .../pom.xml | 14 ++++++------- .../pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../data-index-storage-infinispan/pom.xml | 4 ++-- .../deployment/pom.xml | 6 +++--- .../runtime/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-sw/pom.xml | 8 ++++---- .../deployment/pom.xml | 2 +- .../integration-tests-process/pom.xml | 8 ++++---- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 8 ++++---- .../integration-tests-sw/pom.xml | 4 ++-- .../integration-tests-process/pom.xml | 8 ++++---- .../integration-tests-sw/pom.xml | 4 ++-- jobs-service/jobs-service-infinispan/pom.xml | 4 ++-- .../deployment/pom.xml | 4 ++-- .../runtime/pom.xml | 2 +- management-console/pom.xml | 4 ++-- .../persistence-commons-infinispan/pom.xml | 4 ++-- 31 files changed, 89 insertions(+), 89 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml index a6d1908701..5773846b3f 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml @@ -38,24 +38,24 @@ jbpm-with-drools-quarkus - org.kie.kogito - kogito-addons-quarkus-process-management + org.kie + kie-addons-quarkus-process-management org.jbpm jbpm-addons-quarkus-task-management - org.kie.kogito - kogito-addons-quarkus-process-svg + org.kie + kie-addons-quarkus-process-svg - org.kie.kogito - kogito-addons-quarkus-source-files + org.kie + kie-addons-quarkus-source-files - org.kie.kogito - kogito-addons-quarkus-events-process + org.kie + kie-addons-quarkus-events-process io.quarkus @@ -70,8 +70,8 @@ integration-tests-data-index-service-common - org.kie.kogito - kogito-addons-quarkus-persistence-filesystem + org.kie + kie-addons-quarkus-persistence-filesystem io.quarkus diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml index ac259643c2..9540d3e3ea 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml @@ -58,24 +58,24 @@ integration-tests-data-index-service-common - org.kie.kogito - kogito-addons-springboot-events-process-kafka + org.kie + kie-addons-springboot-events-process-kafka - org.kie.kogito - kogito-addons-springboot-process-management + org.kie + kie-addons-springboot-process-management org.jbpm jbpm-addons-springboot-task-management - org.kie.kogito - kogito-addons-springboot-process-svg + org.kie + kie-addons-springboot-process-svg - org.kie.kogito - kogito-addons-springboot-persistence-filesystem + org.kie + kie-addons-springboot-persistence-filesystem io.rest-assured diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml index a158559bbb..03a22af448 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml @@ -56,8 +56,8 @@ quarkus-resteasy-jackson - org.kie.kogito - kogito-addons-quarkus-messaging + org.kie + kie-addons-quarkus-messaging io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml index 9ce09bbd9b..41abed1197 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml @@ -34,7 +34,7 @@ - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-knative-eventing diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml index 981abbf475..fa721e7630 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml @@ -34,7 +34,7 @@ - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-management @@ -54,8 +54,8 @@ quarkus-resteasy-jackson - org.kie.kogito - kogito-addons-quarkus-messaging + org.kie + kie-addons-quarkus-messaging io.quarkus diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml index d59161637d..41fac3c77e 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml @@ -34,7 +34,7 @@ - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-messaging @@ -54,12 +54,12 @@ quarkus-resteasy-jackson - org.kie.kogito - kogito-addons-quarkus-events-process + org.kie + kie-addons-quarkus-events-process - org.kie.kogito - kogito-addons-quarkus-messaging + org.kie + kie-addons-quarkus-messaging io.quarkus @@ -67,8 +67,8 @@ - org.kie.kogito - kogito-addons-quarkus-persistence-filesystem + org.kie + kie-addons-quarkus-persistence-filesystem org.kie.kogito diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml index 96f0e0ecef..5ee3f0acb4 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml @@ -52,11 +52,11 @@ jbpm-with-drools-spring-boot-starter - org.kie.kogito - kogito-addons-springboot-process-management + org.kie + kie-addons-springboot-process-management - org.kie.kogito + org.kie kogito-addons-springboot-jobs-management diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml index 1cc8ca0bd7..ea3863b225 100644 --- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml @@ -40,8 +40,8 @@ jbpm-with-drools-quarkus - org.kie.kogito - kogito-addons-quarkus-tracing-decision + org.kie + kie-addons-quarkus-tracing-decision diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml index bdad3c5e78..ccc4b93310 100644 --- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml @@ -60,8 +60,8 @@ jbpm-with-drools-spring-boot-starter - org.kie.kogito - kogito-addons-springboot-tracing-decision + org.kie + kie-addons-springboot-tracing-decision diff --git a/data-index/data-index-storage/data-index-storage-infinispan/pom.xml b/data-index/data-index-storage/data-index-storage-infinispan/pom.xml index 1fa72cc112..f0b572f156 100644 --- a/data-index/data-index-storage/data-index-storage-infinispan/pom.xml +++ b/data-index/data-index-storage/data-index-storage-infinispan/pom.xml @@ -64,8 +64,8 @@ - org.kie.kogito - kogito-addons-quarkus-persistence-infinispan-health + org.kie + kie-addons-quarkus-persistence-infinispan-health diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml index e1c7ba7fc4..fbdae338bd 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml @@ -39,7 +39,7 @@ quarkus-jackson-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-common-deployment @@ -47,8 +47,8 @@ kogito-addons-quarkus-data-index-persistence-common-runtime - org.kie.kogito - kogito-addons-quarkus-source-files-deployment + org.kie + kie-addons-quarkus-source-files-deployment io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml index 0d0ee45849..943f7f4b60 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml @@ -49,8 +49,8 @@ kogito-addons-process-svg - org.kie.kogito - kogito-addons-quarkus-source-files + org.kie + kie-addons-quarkus-source-files io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml index 2f3f5fc222..63ebdfe24b 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml @@ -48,8 +48,8 @@ kogito-addons-quarkus-data-index-persistence-infinispan - org.kie.kogito - kogito-addons-quarkus-persistence-infinispan + org.kie + kie-addons-quarkus-persistence-infinispan org.kie.kogito diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml index e5315e248d..fe3f196c72 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml @@ -48,8 +48,8 @@ kogito-addons-quarkus-data-index-persistence-infinispan - org.kie.kogito - kogito-addons-quarkus-persistence-infinispan + org.kie + kie-addons-quarkus-persistence-infinispan org.kie.kogito diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml index 5cd2d216f1..4d983333b9 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml @@ -44,8 +44,8 @@ quarkus-resteasy-jackson - org.kie.kogito - kogito-addons-quarkus-persistence-mongodb + org.kie + kie-addons-quarkus-persistence-mongodb org.kie diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml index e8c3073291..66687c90c0 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml @@ -44,8 +44,8 @@ quarkus-resteasy-jackson - org.kie.kogito - kogito-addons-quarkus-persistence-mongodb + org.kie + kie-addons-quarkus-persistence-mongodb org.kie diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml index 9e798a3c48..81c1036fc7 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml @@ -48,8 +48,8 @@ kogito-addons-quarkus-data-index-persistence-postgresql - org.kie.kogito - kogito-addons-quarkus-persistence-jdbc + org.kie + kie-addons-quarkus-persistence-jdbc io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml index c9b77d9c27..24437c6241 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml @@ -48,12 +48,12 @@ kogito-addons-quarkus-data-index-persistence-postgresql - org.kie.kogito - kogito-addons-quarkus-persistence-jdbc + org.kie + kie-addons-quarkus-persistence-jdbc - org.kie.kogito - kogito-addons-quarkus-source-files + org.kie + kie-addons-quarkus-source-files io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml index 359e2a8d34..fadec9f963 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml @@ -35,7 +35,7 @@ quarkus-arc-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-common-deployment diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml index e3bfe9e9b6..3932306aff 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml @@ -48,12 +48,12 @@ kogito-addons-quarkus-data-index-infinispan - org.kie.kogito - kogito-addons-quarkus-persistence-infinispan + org.kie + kie-addons-quarkus-persistence-infinispan - org.kie.kogito - kogito-addons-quarkus-process-svg + org.kie + kie-addons-quarkus-process-svg io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml index f3cffacf42..f8f56c8e04 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml @@ -48,8 +48,8 @@ kogito-addons-quarkus-data-index-infinispan - org.kie.kogito - kogito-addons-quarkus-persistence-infinispan + org.kie + kie-addons-quarkus-persistence-infinispan org.kie.kogito diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml index 63c0c0bc55..9b9dd4872d 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml @@ -48,8 +48,8 @@ kogito-addons-quarkus-data-index-inmemory - org.kie.kogito - kogito-addons-quarkus-process-svg + org.kie + kie-addons-quarkus-process-svg io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml index 03dc482819..d866905155 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml @@ -44,16 +44,16 @@ quarkus-resteasy-jackson - org.kie.kogito - kogito-addons-quarkus-persistence-mongodb + org.kie + kie-addons-quarkus-persistence-mongodb org.kie kogito-addons-quarkus-data-index-mongodb - org.kie.kogito - kogito-addons-quarkus-process-svg + org.kie + kie-addons-quarkus-process-svg io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml index 366b3038b9..fe231eb406 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml @@ -44,8 +44,8 @@ quarkus-resteasy-jackson - org.kie.kogito - kogito-addons-quarkus-persistence-mongodb + org.kie + kie-addons-quarkus-persistence-mongodb org.kie diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml index f94a99123a..86e8c2e46d 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml @@ -48,12 +48,12 @@ kogito-addons-quarkus-data-index-postgresql - org.kie.kogito - kogito-addons-quarkus-persistence-jdbc + org.kie + kie-addons-quarkus-persistence-jdbc - org.kie.kogito - kogito-addons-quarkus-process-svg + org.kie + kie-addons-quarkus-process-svg io.quarkus diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml index f617c12cad..3e1defacee 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml @@ -48,8 +48,8 @@ kogito-addons-quarkus-data-index-postgresql - org.kie.kogito - kogito-addons-quarkus-persistence-jdbc + org.kie + kie-addons-quarkus-persistence-jdbc io.quarkus diff --git a/jobs-service/jobs-service-infinispan/pom.xml b/jobs-service/jobs-service-infinispan/pom.xml index 89c72945c8..a5bfaed242 100644 --- a/jobs-service/jobs-service-infinispan/pom.xml +++ b/jobs-service/jobs-service-infinispan/pom.xml @@ -68,8 +68,8 @@ infinispan-query-dsl - org.kie.kogito - kogito-addons-quarkus-persistence-infinispan-health + org.kie + kie-addons-quarkus-persistence-infinispan-health diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml index e3f3eb4501..705ac833e2 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml @@ -39,7 +39,7 @@ kogito-addons-quarkus-jobs-service-embedded - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-management-deployment @@ -51,7 +51,7 @@ quarkus-resteasy-mutiny-deployment - org.kie.kogito + org.kie kogito-addons-quarkus-common-deployment diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml index 58cb0eefda..4901ba3d81 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml @@ -79,7 +79,7 @@ - org.kie.kogito + org.kie kogito-addons-quarkus-jobs-management diff --git a/management-console/pom.xml b/management-console/pom.xml index a01fae0840..58f3238c55 100644 --- a/management-console/pom.xml +++ b/management-console/pom.xml @@ -40,8 +40,8 @@ - org.kie.kogito - kogito-addons-quarkus-process-svg + org.kie + kie-addons-quarkus-process-svg io.quarkus diff --git a/persistence-commons/persistence-commons-infinispan/pom.xml b/persistence-commons/persistence-commons-infinispan/pom.xml index 1f80b3d489..51f921248e 100644 --- a/persistence-commons/persistence-commons-infinispan/pom.xml +++ b/persistence-commons/persistence-commons-infinispan/pom.xml @@ -52,8 +52,8 @@ - org.kie.kogito - kogito-addons-quarkus-persistence-infinispan-health + org.kie + kie-addons-quarkus-persistence-infinispan-health From d2eeaa48e291b22bde77502b25cca077c3be8762 Mon Sep 17 00:00:00 2001 From: Enrique Date: Thu, 7 Mar 2024 10:07:11 +0100 Subject: [PATCH 18/20] [incubator-kie-issues-973] Document job service in compact architecture (#2001) * [incubator-kie-issues-973] Document job service in compact architecture * fix comments --- jobs-service/README.md | 98 ++++++++++++++++++++++++++++++ jobs-service/docs/job_service.png | Bin 0 -> 13739 bytes 2 files changed, 98 insertions(+) create mode 100644 jobs-service/README.md create mode 100644 jobs-service/docs/job_service.png diff --git a/jobs-service/README.md b/jobs-service/README.md new file mode 100644 index 0000000000..322da8c9b6 --- /dev/null +++ b/jobs-service/README.md @@ -0,0 +1,98 @@ + +# Jobs + +job service represents a subsystem within kogito workflow domain. This component is responsible for scheduling jobs. In the case of workflow this module takes care of timers such from boundary events, SLA, throw events relevant to timers. Also is used for things like human tasks notifications. + +The system supports two different types of deployment: + +* Compact Architecture: as a component deployed within the application. +* Distributed architecture: as a microservice deployed independently + +The current support storage is + +* postgresql +* infinspan +* mongodb +* in memmory + +At present jobs only supports quarkus runtimes in compact architecture. + +## How jobs work + +![job service](docs/job_service.png "Job Service") + +The concepts to understand the above picture are: +* transport: the medium used to transfer a message between client component and job service. The transport could be http, kafka or in-vm at the moment. +* sink: is the client endpoint callback. +* storage: is the persistence tier of the jobs being current scheduled. +* job service: it the main component containing the logic of scheduling a job and storing data. + +When a client invokes the job service the client component send a message through the transport tier containing the information required in order to call back the sink once the job times out. +Once the request reaches the job service it creates internally the job and stores the data about the job status in the storage. +After the job times out, the component calls the sink signaling the client using either in-vm or http request. + +## Using job service as Compact architecture + +For using in your project this you need first to include the dependency related to the transport tier. in our case for in-vm we use + + + + org.kie + kogito-addons-quarkus-jobs-management + + + org.kie + kogito-addons-quarkus-jobs + + + + +after that we need to include the storage we want to use. For instance we are using postgresql + + + + + org.kie.kogito + jobs-service-postgresql-common + + + +In this case for postgresql in-vm it will use automatically your main data source available. +Here you have an example of this configuration: + + + + + kogito.persistence.type=jdbc + quarkus.datasource.db-kind=postgresql + quarkus.datasource.username=kogito-user + quarkus.datasource.password=kogito-pass + quarkus.datasource.jdbc.url=${QUARKUS_DATASOURCE_JDBC_URL:jdbc:postgresql://localhost:5432/kogito} + quarkus.datasource.reactive.url=${QUARKUS_DATASOURCE_REACTIVE_URL:postgresql://localhost:5432/kogito} + + + +> Note: you need to us managed dependencies, otherwise you need to specify the version of the dependencies. + +> Note: in case you are using other service like MongoDB, check you need to configure the storage with the proper properties. The components uses the common quarkus + +> Note: in the case of ddl scripts for pgsql you can find it in `jobs-service-postgresql-common/src/main/resources/db/jobs-service` + +## Distributed deployment + +For distributed deployment job service offers already builtin docker images. This images are based on the repository + + +* [Kogito Images](https://github.com/apache/incubator-kie-kogito-images) +* [Kogito Job Images](https://github.com/apache/incubator-kie-kogito-images?tab=readme-ov-file#kogito-jobs-service-component-images) + +And you need to setup a few things in the client side of things: + + + + kogito.jobs-service.url=http://localhost:8580 + + + + + diff --git a/jobs-service/docs/job_service.png b/jobs-service/docs/job_service.png new file mode 100644 index 0000000000000000000000000000000000000000..77c43c438456301e780738e8a26bd6b2ddff488c GIT binary patch literal 13739 zcmdsebzD^I+BS9(Dx!#l2_i^HN^S*dK|n%ML_ivb9MS}75$PDWqDTuUUD7ZNol+75 z(lNj=gJfi66tXgsDr96k zEy&1rkni6MKSBFU48cFU?XJt--VYyc`|m%8?@!v_(6m>zHnw*%KpBylSXo;dUA8ks z85vpGJ+QW)-Blt+Ms}J^R`S|y=a}g}SDo7qo7MB3g-`e`XVGS4!v&#CpRhow=XcJ}9Y=6CMh>2OK>)MwLN*W;ozZzZQUG_>cK2l}BRSU(@30dih+2CQ7{p?D>;iFIHan|-=OkHocekXp zw1(F3xO2O1f?M66pJU0SDK&MU=kTFH3U_d(Ni-wn>2PR-F2x0E^f|nCGoJX3RNwY! zAu@3no=0_GoymL3SB(k`7cr4Sf+0$-U6Sy@-Y^him|$`!IVGcKnz0=%r03Adipdkg z^JpZvjZVC3)QMe)OjZ@MbEq>(Yp}{Or;0}2uszX$`pA(Z8G?KkXW`>`g4a#BSjAA= zM`S&kF?9U!+arFe<;?Kgd$##4*C^68NM;FtF5s3J&tEIF9%*I#@dvG;lx7A+aUK7> zgyI)}tXh#`dl{Agvt?wbq_CG8XBp5|MG7}~SY~yT*$Bm!MuudE_Gze3GLB3c9z1mD z00l*={WFemtf-!v1AjEmT~!SK=VyTqq1#`dW8+z-xh@*T+&?vC@#gJYw$yq1!ils$ zUj_d|Xm=Aje`)*X&37SQCc;@!?XKehkJ!r>=Y7k0pijI!iYhj_GmCbLZYq8jKoSZ@H>u!Ne z;)>U&L1 zhp%6szJC4s{sRYo_t;o{>gCn)`r59tva*&c+5q&_m({^H#Y(n znTaMCXIpfab);%{XIq}4^nSu``StLrQ}PxT?6APMH~fyzNL}RO`uH`gYua(jQFzCW z9q+4PJ)>h7Pvfo44Y>78>jAMa4&6HO&3P)v>95Z)7^Y4=*UPrHwmMFI4)#-B!7D4y zt&>Y?Ki=7Rw!g@2YlE1gR}|$i*^yz@CzNkLetoPVcDyZ-`pG^jW)6;q1mg8Q`}R@8 z5hy6s?+G6p8Tn}0!++(<70nV4Q6A&^yX9UK71h&2#!L zw~wz-51$+>^e^RP0Y5gDb-(r~ve29X5A6JK^>|-_fIzR!E@Gb(6PyH|QeKa;j&iu) zjewh3BQL*;i{eApm|ncS+h)pAPZ~ify z1flYT{v1ABKht^so>jp#zsFLt{`_1ym0h1hCt5h}LbnBfTFIsh^2O-Bs7wYoB%`Ec z(vfnf*LAk&{Dlj_F){TIckFu5_8~Z&T7yY<{PppUNz=cTTO@UK6-mcA_3EpcJnLa$ zb+JzUwa<^7ix9BZ3n(0zLN)y^u}{eUd+E6#k?XRu2MD9MVM3$$*zewq_qskB^x8Fw zlGAd%ZsB$_SSu)8PWOHO+_`pfywxWtXpGa7bV#7jp8Cd(8#C{3;yM2WnJvr86ktT6x1O&nb`kkL> zTNkzW1aoNn`1qV>X3m6@s|sRjTqhACc}x zFT9zc7+c7YD7RgNRBm43;W^1?c1+)c^e&3ePhM8mpuZ3;GFQ55WNge;STS_Ft=$fR zKa3sNm~mR1>}>2&uGsZtFU8pl7oIr{xOes_C&eQ@Fh0r+cE+FnYD*9I$XS0nK3_;H zw6IjD#hp8Myl}?lT>d;xF&kfvvvz#57kb3QV#!vJp3)&&(_MY+`0=B3bXwyFbvaJl zjN(n4!AP((v#}+&;5ot%MdL<`+eeo*_~RCIwZw1(`AP(03xUtHWu%b1;wyQ1sa1~a zr@kk|Z1HI2$}ly@R5qoCis;zboA&nh@A%%mdk0nS!IQM|hQ8m}hQ=M$sC)Ds(uk<~ z1d?`+>1Gu6#NorGGkpc_6ZS{K3q)O)oAMndwFYK59oJgVC?7czY{qLhs$ebs!tWbf z3FmgxZ~s1>Gr%k=+SkKfv1@#Myl`W=r$2D;$d6w>sPaE~o`oeOENpc8qKeO_PrNTf zLL#{hy>i|bWnec~P8_GBdj*;YB|0NFVeg z=8U0K7+3nzr0C?mj1zS=vyQ$I|L$FLmWh&jnog}R4I8b9^T(WXXoc-7Q#=?b7Cm%= z3GAwgwbozH&xPUchi_KH=nU{xRkw(Qv<(}Cim97Ek>+so#AurfDj z(U%|k>eaD0w*}dwM~^x~$++q;@hazSyD0?CP@mJlg)?U!v0&U@!i%!4`s(He%ZnJM zU#^75?u$RGc3C_ei%-hjyjMj%pr+gNC?{JS&m$hU!hstgs7V(?H{)?xd~p1-R>f3z z7W(_|-noPZ;k@BMVOrh?haWw9#5fjwh>exi;LGDZ>jcc!{h8jpUWZOyk*#$C)C@I} zX0o;CkEr!~`SN81j|pX7ULK^)%cv+h8yl`&d&%!kv?W?}XIAzcajy%ztQ{fba0z~T z8k$dA+wG&&)U`OAQA5mCMn3c6(t!}3skqB2nN<)zw^}@%;Jox6!ik*hg6W zy`L2|luct{gE&Ba{CE{kV4%Jx_#A0vI0(99NqolTk_|L(6yU|Sh`Bi%FG_|wC}%sm z3Y<9EG}7)vj=L>3OQ&e(1aj!+H|5!x2sunhdQ&ny_wze<=~5lG)?86hky1Oy>cY8m zPnbMb9zi?IFeu*(kt=om`c76>R)rYB;D`uXYw1*)AN`1#nb`||FjGX-BlGq1>&~@3 z7cF3Ij19Y7j}gaM_GAy*2tH_iPm!vf^Ik1k{gXxaOE{^fPo}C-eCEdE#7YPZn{TB% zkj`&x%)GWdJq(rkK5?dR>g#8}hY!ipik7v8hK6KhWbU?oP=>BWO;0~H{ax>Oq&8Fx zJ$~|JygQ2p@{8Tc6Bb|KG&_o10NP}HLIU9*aYapyOj`cLB?MPMBm8f0MSAa`W;pg) z>v;U9Psjd56{Bs5sxczymt|$w4<0=DH&pRfItVpVa|B>cO>ONNHa5S)LXjwbOF5{u zd81M051QZXfyykh^6kkdtG;~2S<%8{W?dthL#f1zWC$~vbUv#-mP%5lCUhpfdGqGE zukRbD+5Qtcaj~(}#rV-t5v+dZO1QButxL?=Ubh zc6(Ab7^B^<7e1vXg(vgA)IKp;QWbq;d(=CGRM&vm5f9ztp-lEf?R=^i(3-Fgw;>Z9WUTeS7W>^C%oUeFn|^SnE8?AWVh)4qH@h(t%vE$G?vkSX761f9P< z+DFS{Ois47+F9Z}`0T{Wd^HmZYC=6AfUYbPDk|}HE{<@&p`m-5M9;18Xsdi5AUHGm zlN=CdJ^=xhc+`%$dY;C^3=Ftj+hMZj0RcwcnMU{p_l>1aBsTzzuCK30@LSSB0baTw z&KXsLV&!lY26&oa(in#z0F1|~&#rxxTu?AQ2+;$#1(jBpr{y8w?_^t?H1A9^s*m8d z7$}YfyxIbN`2Ef3s;3920a=e_R5J=&lj3DVoY&{8uc8;uLq#xzSBoq*N!&LvQ3ddh zpcz0eWe7+E#9`W=6uL$+>vw{anU{C*F`?*9VHA@Craj&MwWtN^4tgr18Yz;~Jvj-U zTbqls1DGDG0t#_)@#2kTZK!lrb)js?8$nw}>Dx7o+rJD8tEvh(l}GG%J;{AGZ;dg8%^Oh3udA7rABuoPDnlS#~+6w+ygSbs&Q!dEI1i^~L=45BO36zHv-GVTH z-aF^|U1x2ly10p5!cH?H)@X?IlC6!|?hM0yLE@W&oW(0=8HDWb!rK9jX#vPZ?A0r9 zyo_;QKKc9azauR&y<{`0rl#gl1JQTE*Eu@P{xn}%lF3=?j+B$gdqJ`y6=VU+$>Xu^ zOgwODZE^fbpH;%OCwte&#J6n4(_qWUkb-7d9cVzi7ZCJNVnQ6MbA?1g7Ur=sxR1Co z{q^%(*$`&N4S%Gp3JXU=i~CmZslPPQp1f$%vK|^`lh~s+Q0%@V7r@XEkS5=oj+9fL|cdzEf8D6utnvIC0uw5yd8IOS|1CAw+A+eY@#)<0KR?^si zZ+g_!bc>8mz^Wd}EeP($=-E)5IW8z)Nkiyx#tT>}K<{gCD&t)l=Z32S-ntTJ*!7F) z%ei{JIXziVpDx{S=$7u;QM@|AMr3+y7mmS>+waU}QXLI1D7WPA*+UiLyW(p%7SuXk z0i`5&PGmJz`UR|ReEj`nB?T;5ef$t za0HK66YQW6=q)Wo6UYQ@zCBzkSpYDso~pH{6ms`Bb@k(9aDyYGqdRTpzFnha5V~zu z2rpQk9cYB8*dK!y*ETaVJotaVs6p zp$oC`0hQNhH3sm$G_uISXp;5vWg|d9P;75Ue11ckk<~k5-NeYBmr@@q94^h|{wh&5 zA%CDt9KCS=o}nSs3w(Bu)mx2pJqW=ofKfoaxI{k*Icfk|>o)ggA5iXji1l4_71T;x z7F}GBa#BDxk;)5Ys9+}F4@&$Mw-p;WQUwTp?1ncJ9bKI_lShpxu~z~>0!Uksi|JJu z>fni&7>tsN%288cbi^c<9*Qdx-13A#PFW60v7a*!mp)O0+r=~M<}j32@d*X$;PyG0Q1c#S||!v zU^@d~EpLT}=)4SWV<)d!=C_et%P9nCp<<>cYU+(0B1mw=3T#^GPEBS}`nc4L+oRT| zbFy5CR+}5Mo+07k)vyE31e^eR{9SlmyW>o6_XcM09qgY;9J_udO9 z0Yv8lTefkukyPzRR1H`RsxBB|Yhf&lex5N|P{Xu6M1C-pcL2st_@$tI_ z332aDTi-XAczVKZqDlDh9RR+$0E8k54XvWBpNe&-LIl?%w)Dc6a8R0?R3U%|*H`90 zS@wiwTlS!4i-@S9iUY(2B{9-d&>(D<+BFE!81k5 z9e*Ev5awEzBMtx(6q!((co1Y=!H^0F@32s@$Y{OHY_vzzllo`-2^Wu&C`LX%5w z#!RAAwX`OhYY!$DP>QU*>aO(HP}TDw8G$54n$+KtyMI6a-4+)P^03nHL>6FH$EmJI z2DJEP=h@!8kXT`-1>jZ-Kv^@PY7?q*0a-Xh_d@~#X&GdY{!WccNXEI&H14}lVu5^R*^jGuk)JFBmeV)Pq51J4Aoi@@eB_w5wCH-WEe!!T6>hFh zZs%9$0sYZ!6qn=AiK9x?o-#UR;m}*xuv@nscLEd@Y8o1c<{<4{n=|L6{7^H9r!J3WzK*|1hhJneh!N4`je=b7zGsS z3RF=VHgztzaX=Ay_%Q8@92`Jds&ri!Mr0|O#1!621pr;L(ci}dL z3!($!HxIyjTo4iI-Pi!oGFV)a+3EB3JxQBSKY~dmr)y(lBQZ_8JMwjMKIzRV>%w4Y zf3d{JCGKmE%nA{=28Th)J}K@Y5*Zl@QXdK`AxMQ9t+quCg0A=Ke66-MN@Yt2FM}7M zp=y(psmUZ@B_m>Zpga4&eEA}>)TXL;Rl$UIuWEv#1C!$==!0;mrIB7!y?dvD`r+wf z?Z(VKJT}oL)tr|u4ZRH#Lt&=6ta1SVGf4%~*TOA54-5qK*Cy)8!^3mcZRMkD;|iye zm&pB^!^JB@hejJQp8bPOhw!4#bEhFyvwA0==H!UusOG&Uro5BZjB|RH82Od@Jl3Y| zC)#}CnlOr4R~&e*4EbIH~qHW0jM!b-qgDEN*DKdY&5&im^hKF<0$+t%sBp6^(&U zLw6iR05HdmVNLs5tlGwzwwIU6&w37G+uafA}s|%a^i=cC_FXxot zKX>ZA1$a{*#dk#zHbdH?hF3|X zV8G)cN@B8*el~*iIu7k>Ae6lX@VAr8q=BB%ZSESx;X}YMz#R&{8HJI7oc#ogAA)Qy z{>FEIHg}kk->O$eM~B|aU=B7UKf1=xJ@)YI$D#EX*eAG)!pCntYH8tNIyyIU%h=J8 zzqz?Nv;)x0Q8-|lWEv*ptnQ@s4VQe~_KIbV*vV8s5(54~)aP9BmLcTKw63R$U`D0; zMgpcc@8yVt<`|4(^jx>KmOh-p4l#DT$on70Tuex#0v-kQDm9Z|L}dMC1A|uR1^KYH znp_pWZCy$1G)NR%0L1lhb2$JN-q2-d654&xn=stNi!mrKJ9Hm7gKa3Z>nRZY+cx zGYVp5XHQvhv026IGKzFlTJT4&srU5gcXyA6DiJgq5=iD8`j)nNIwHhgJ2zmMrIGRp z8vq@g^sf!W78?LG0zGj7klI|AVUV(lN*SmyjX;oWg<^Yc$|(TSJ$dos15X1kTe2@m@|jK->U6z23dhsK>xsiBkCQT> zwY>#}2C!WfWT8Jy9o~NY*kqHZQw0K@B~pnH*av`)8>(qJ9(A(7arz3-;s7ADwJXqB z{VOUYk)JCjv?2sG07QUr?drjDZ>X^Qhk=bEm#&ZG2>@Ww!$n>WsuK?&cQyPf41ykr z%vVr*VewbU%ei2nanEgK&>ML@00s*{IUVr&u58Qb=8pyva7S1{_tj6_cT35LjX9u3 z55pevEf5F+EiEdBfL*IVm@ywgFI72uX7peveL$pNc@3r67MQ4NiHAEhLFl;OqOFT< zIhjDE=8q15x=hW))Ciga9GWqd8E9=0FJB&IR*I_!!g0&07e*J5l1%Q4N1##SA?8xo zBwOOr2H*&)8Ju#7^q2LEV*ottdx*#eMXto1bFgu?!vO+E85nNfy?Yua98N(cHiOrp zAz#zfqy^-IsM#dKn8s|#cZqF9eC2g-Z!fB|+7f0BdFJhLuH6-|c?$~*-(lQ>R8dd` zn1zI*K=dr&#Hur&KmT-b(Y~d%6(JiP+SW$EBu^A=+J#?+F#)m;0G%&lVy46jofp3= z)A3t;PcsK0K5w4oW|Slp4Md7Etn#g5CBiC)|Tx-8(`UVUk4X@qk_ zpx4&dj{tWB$ucb|A*DeDnIGO$hV$yqG9j!^rrS-lu>zxz2x1f^lljN4!OzD>^AHMY zhG{Fa%koq$9C|HgYu$vr91xd3w8uE2fe*|)c%0|%f`ADO+(!T0iPJFSgyCpVhdwim zNr6<~yLS&J+l8dj=v*BR=u|gA4;}DWy9}{VIcURWSVc}8R#8!j5OvKixDyMAiV14( zl4zco)b?Ec8B*)n0WiWO)Hf!EUe9g*#<%*oOlYS=!^5V4!eIwQHWq_(sa)aa{xtE z1Dne^a-E)Oz=OFUS-xglB05vvbaoFCP9QHuAS`+^kAXL$?x?!;^wGrxg=IK($5+X!`w()n$z(4?&>%!E{Jj zlnP>;o~8{Oo2|`g&3dNR0n^r?iTIi1hUvQ2e829^SF>(WB`Q@DJ(zZak9Fqiasu(6 zZ56+a&VMySurbI4G)1;FI$gz65486R9_tdABf$tQbuZ1aV{?!z!#08uSBwts*|VoV@ch}ceBY@&S9SsC;)hXF zf8be0n5B*ZNm};tYfLssz6MveXOiP4mvHTtl$^)~)gFm*m^sPH%M%>w6D5K10RBVT z9`K(ZGrjf~k00*@1b|FV$-qJI70Y}Ub&~eK8%rgh0V&bfbyn-agNruCoISvHhj5x_ z&#D}PXsm~klx8040_;dzKfj-hy!>0xQ<3Qvg6|=Bt)&+t=(6cGND?@7EmbM&NHJg&o;J05kkn`iT8bW<^g1hrE0ky8(QQ47dP6 zWkRKf*UnCBp147wO@Xi^7~dmPBak}xKZGQX^V~!O|BMuK&kv{eeJ*2pQp`;dk@)}^ zBGas=Pj~mb6Lq0lz^K;YD~Lmg6e=qt^R1Qz1EZ&B04EV~$6C7JJim9j^7sKSj?qF9 zApX$p)wPCkgu`eyeP99*Ntq;(L@>dCTgG(rlD@;(8t9UdfN~K%)2ScL;?!%q4;h|< z*`SVIB@a5+adyp8@hy_lXhSR(@YJ?s%XRm+cR_?_(?3iomyts@_Lul@Y zTW8zT^f!Ns1~mz(UQejRYT!%8!$Zu})D%%wfn3|Huh;^nl1SGp0=&2nB;>B?uhm1S zJk2a)ie!y+W6&fJr^C}{&uoFE^Pom##5Pw9%gW0i`Sm=(Q} z8HA2Kgtm(e$Ff|O%*0l|pM$QBD0$yOPm2|DcmuQ*=IlqHkKsr7SXfxR;Q(F+2Y&(S zuoQ|X^xR##1&;54vc|{9bJ-3_Le(#1_^iG?GR=s95*sC8-2lqlladl~;N2FzxxpYD zWEo+P1C43~2nQe>WG1h!E=`bfOuI8LT-N&Z8o(g0c}IQAtREXI>mal>LoO4h)n1EJawT{^DQpJ9c;FJ6>>P=5P7D9C9xc)^}ZUDp=9@d?yJv5Rm#Fs^OM zGHFB+5nl)BTl^MXrGN)yA$>tqzX!GwlAA==KWm}HEw5v?36-NF9y zOo`a=Q$KKgQpyp(fPf1^LaT*%!0t2J@b}PEFF@Oc;|j)L8et;Jdhz1xj~`!vFy!m& z3)qi0K?wuW*;BxKK&iY8K$_x@rho|-%n&v=H+S#dd-T{b$y>J$gUtRG3>5$3P+~cI z_AxXh=(|4t{^x~+zPbx{Ru+y;q2f(o!WADVl*7F+YRa0KmBrb0%Xe%s80KMrbKd=I z5e?v^G6FS(e7K$_sjfJ?+k#9mR`FZCY){<`Te1TcYMC203f@>f|2oXC8Pk*UGX(@z zU5Y`{1hQ|`?PfI0idkUAjHbhX7Vhw1a4Yy0{SPw&G+G-sgZP3uPoMr)sQ);00j&ZC zMW;Lf>uQK^j%{SyKk)A>`VY3Vb!@{fl|MV~EaH9K*N+>MEs86VPybr{m=+32vAW!f))+7k_RpE2jFT1 zN0A&TS}=W(1x1P@cfH#LlZuxFQseN$(F>3;HXpHFKw$^S^%M#knQp#4m?|k?5I<}$ zbQ0#*psNDWZU*}vVz)b3Eeur|R0}F-TzFr$w7bB;pli+p9}ET$3jhcx?ry8&2{7Bw z0=le+#?z1qInC4$Y;6)z!$qJqAm|+=v`n-1ONhM=q*h>s20()me*#&i4}#*O)++Ikt1FsxN$&NQy0WN?@kYJKG=-9WM+51vUI#@%GvnSKWRhAiTZ{;OG=acEgb;NQl!6;zDCIF} z*p0LTMCG^WzJh?ceN1kp;OcY+#ef7bmo)3SB@f~w42B$n_&hh=khud4=bnNJ2ITK| z(EmZ}3;Ar`xs4Ryc#t~=zNOAl4HPvOMB)`t*Ae&H7U(l|mpx%lfLK_9L>8WRC)@&u zw}OVyhi3?IcMI3k(9+Tx_hf@1)e!W+bubn%gRKJ4A>5FPfqQ3~E_9jQbtU>KpxdoC zZmm;+yaPkTCnF>G5zU9MQ%3?0cZV~KUC35Im(whA;ZuFDU;viR-Fx=zcmWC@+>tBb zoX3XJz#{BjMEq2my5!RI*%{H$39Oje#gRrpFJ!4ZJipE$`%$-2&Y?b<{V0tyzBtZpE z9fCt%t{vmjxTHu}#K_B+g6h;qV zs`{zmfO)8F5et~K7lpk{X3<|53A#cn%&+5I zXRd+_r83AO%{f9W*%Ae4e6Qm9kr+^nU&aZ5VU@zHE4~34j)B7rfqW33^B{O2rZGUA zxoa~8cOaC3VV1%(l?x*=*Z_`DF9gphDVRYV51 zz#z&HUN<}w(N))0Mql{icFn}P!Qq2uhYK}ANyY#81? zgrVQk8;?-{mk4x*!Mfp0Eg%{BtdnDmhItP&iF?o}e?DR1g1W3cSL7iDG>`sozmchl z;Pe0$#Bz>=5Zd1jq>s+NgU1&DqRfu{@kqfR&mbT>aM88Z(FeO-c<_b1{1}v>W=z% zQe9tUArkR{)g_QFz*lO!kJNWZLz+kN*z` Cyrgpg literal 0 HcmV?d00001 From 69790d611705b2c6e7e74b497a66a3587457364c Mon Sep 17 00:00:00 2001 From: Enrique Date: Thu, 7 Mar 2024 10:07:25 +0100 Subject: [PATCH 19/20] [incubator-kie-issues-974] Document data index in compact architecture (#2002) * [incubator-kie-issues-974] Document data index in compact architecture * fix --- data-index/README.md | 94 +++++++++++++++++++++++++++++++-- data-index/docs/data-index.png | Bin 0 -> 13357 bytes 2 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 data-index/docs/data-index.png diff --git a/data-index/README.md b/data-index/README.md index 3e4e7521ab..e555ede1a8 100644 --- a/data-index/README.md +++ b/data-index/README.md @@ -1,4 +1,92 @@ -## Kogito Data Index Service +# Kogito Data Index Service + +Data Index is a subsystem/component responsible to store a snapshot of the last state of the process instance state. + +The system supports two different types of deployment: +* Compact Architecture: as component deployed within the application +* Distributed Architecture: as component deployed independently as service + +Due to the nature of the system it support different types of storage + +* postgresql +* infinispan +* mongodb +* jpa + +At present for compact configuration it only support quarkus runtime. For distributed supports both runtimes quarkus and springboot. + + +## Compact architecture + +The next dependency is added for quarkus and being able to use in-vm transport tier. +The same dependency is used to specify the storage of the data index and the transport tier at the same time. + + + + + org.kie + kogito-addons-quarkus-data-index-persistence-postgresql + + + + +As this dependency will include the storage as well and the in-vm transport. + + + + + org.kie + kogito-addons-quarkus-data-index-persistence- + + + +where storage can be: +* infinispan +* mongodb +* postgresql + +Current system + +![data-index](docs/data-index.png "Data Index") + + +The concepts to understand the above picture are: +* Transport: the medium used to transfer events between the runtime and the data index service. The transport is http in distributed environments, or in-vm for compact architecture. +* Storage: the persistence tier of the data index component. +* Data index: the main component responsible for creating/updating the data index, and for providing query capabilities. + + +## Querying + +Data index support queries through graphQL (basic.schema.graphqls). For using the endpoint you just need to explore in your deployment the URI: + +http://localhost:8080//graphql-ui/ + +to start working with the queries defined by the schema aforementioned. + +## Distributed deployment + +For distributed you need to specify and addons you will need to deploy the data index as service and include the event publisher + + + + + org.kie.kogito + kogito-addons-springboot-events-process-kafka + + + + +or for quarkus + + + + org.kie.kogito + kogito-addons-quarkus-events-process-kafka + + + + +More information about the Data Index images in here: +[https://github.com/apache/incubator-kie-kogito-images?tab=readme-ov-file#kogito-data-index-component-images](https://github.com/apache/incubator-kie-kogito-images?tab=readme-ov-file#kogito-data-index-component-images) -Documentation: -https://github.com/kiegroup/kogito-runtimes/wiki/Data-Index-Service diff --git a/data-index/docs/data-index.png b/data-index/docs/data-index.png new file mode 100644 index 0000000000000000000000000000000000000000..8619654c5c3adca12421252f64c7ec258a7ac4ff GIT binary patch literal 13357 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 literal 0 HcmV?d00001 From 7db7d310e6b3ccf658b322abed7f6b728eaabbe9 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:44:58 +0100 Subject: [PATCH 20/20] [Fix apache/incubator-kie-issues#987] Update state to error (#2011) --- .../src/main/java/org/kie/kogito/index/CommonUtils.java | 1 + .../storage/merger/ProcessInstanceErrorDataEventMerger.java | 2 ++ .../kogito/index/jpa/storage/ProcessInstanceEntityStorage.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/CommonUtils.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/CommonUtils.java index ba47c72d44..3bc4b724db 100644 --- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/CommonUtils.java +++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/CommonUtils.java @@ -22,6 +22,7 @@ public class CommonUtils { + public static final int ERROR_STATE = 5; private static final Set finalStates = Set.of("Completed", "Aborted"); public static boolean isTaskCompleted(String status) { diff --git a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java index 87b6566433..3408a7247d 100644 --- a/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java +++ b/data-index/data-index-storage/data-index-storage-common/src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceErrorDataEventMerger.java @@ -20,6 +20,7 @@ import org.kie.kogito.event.process.ProcessInstanceDataEvent; import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent; +import org.kie.kogito.index.CommonUtils; import org.kie.kogito.index.model.ProcessInstance; import org.kie.kogito.index.model.ProcessInstanceError; @@ -36,6 +37,7 @@ public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent dat error.setMessage(event.getData().getErrorMessage()); error.setNodeDefinitionId(event.getData().getNodeDefinitionId()); pi.setError(error); + pi.setState(CommonUtils.ERROR_STATE); return pi; } diff --git a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java index 5ea98dda39..386aabcf78 100644 --- a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java +++ b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java @@ -33,6 +33,7 @@ import org.kie.kogito.event.process.ProcessInstanceStateEventBody; import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent; import org.kie.kogito.event.process.ProcessInstanceVariableEventBody; +import org.kie.kogito.index.CommonUtils; import org.kie.kogito.index.jpa.mapper.ProcessInstanceEntityMapper; import org.kie.kogito.index.jpa.model.MilestoneEntity; import org.kie.kogito.index.jpa.model.NodeInstanceEntity; @@ -116,6 +117,7 @@ private void indexError(ProcessInstanceErrorEventBody error) { } errorEntity.setMessage(error.getErrorMessage()); errorEntity.setNodeDefinitionId(error.getNodeDefinitionId()); + pi.setState(CommonUtils.ERROR_STATE); repository.flush(); }