Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NO_ISSUE] Fixing named datasource's configuration for data-index-inmemory & jobs-service-embedded #2042

Merged
merged 2 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@ quarkus.hibernate-orm.database.generation=create
quarkus.hibernate-orm.database.generation.halt-on-error=true
quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
quarkus.hibernate-orm.jdbc.timezone=UTC
quarkus.hibernate-orm.log.sql=true
quarkus.hibernate-orm.log.sql=true

# Disabling Security for tests
quarkus.oidc.enabled=false
quarkus.oidc.tenant-enabled=false
quarkus.oidc.auth-server-url=none
quarkus.keycloak.devservices.enabled=false
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,10 @@ quarkus.log.level=INFO
# MongoDB
quarkus.mongodb.database=kogito
quarkus.mongodb.devservices.enabled=false
kogito.apps.persistence.type=mongodb
kogito.apps.persistence.type=mongodb

# Disabling Security for tests
quarkus.oidc.enabled=false
quarkus.oidc.tenant-enabled=false
quarkus.oidc.auth-server-url=none
quarkus.keycloak.devservices.enabled=false
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,10 @@ quarkus.hibernate-orm.database.generation=drop-and-create
quarkus.hibernate-orm.database.generation.halt-on-error=true
quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
quarkus.hibernate-orm.jdbc.timezone=UTC
quarkus.hibernate-orm.log.sql=true
quarkus.hibernate-orm.log.sql=true

# Disabling Security for tests
quarkus.oidc.enabled=false
quarkus.oidc.tenant-enabled=false
quarkus.oidc.auth-server-url=none
quarkus.keycloak.devservices.enabled=false
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,10 @@ quarkus.hibernate-orm.database.generation=drop-and-create
quarkus.hibernate-orm.database.generation.halt-on-error=true
quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
quarkus.hibernate-orm.jdbc.timezone=UTC
quarkus.hibernate-orm.log.sql=true
quarkus.hibernate-orm.log.sql=true

# Disabling Security for tests
quarkus.oidc.enabled=false
quarkus.oidc.tenant-enabled=false
quarkus.oidc.auth-server-url=none
quarkus.keycloak.devservices.enabled=false
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ kogito.data-index.domain-indexing=false
kogito.data-index.blocking=true

#PostgreSql
quarkus.datasource.data_index.db-kind=postgresql
quarkus.datasource.data_index.devservices.enabled=false
quarkus.datasource."data_index".db-kind=postgresql
quarkus.datasource."data_index".devservices.enabled=false

#Hibernate
quarkus.hibernate-orm.jdbc.timezone=UTC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
import java.util.List;
import java.util.Map;

import com.fasterxml.jackson.databind.type.CollectionType;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.response.ValidatableResponse;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.kie.kogito.jitexecutor.common.requests.MultipleResourcesPayload;
Expand All @@ -36,6 +31,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.fasterxml.jackson.databind.type.CollectionType;

import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.response.ValidatableResponse;

import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -75,7 +77,7 @@ private void commonUnnamedImport(String importingModelRef, String importedModelR
Map<String, Object> context =
Map.of("A Person", Map.of("name", "John", "age", 47));
JITDMNPayload jitdmnpayload = new JITDMNPayload(importingModelRef, List.of(model1, model2),
context);
context);
given()
.contentType(ContentType.JSON)
.body(jitdmnpayload)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ quarkus.arc.selected-alternatives=org.kie.kogito.addons.quarkus.jobs.service.emb

%dev.quarkus.log.category."org.kie.kogito.jobs".level=INFO

quarkus.datasource.jobs_service.db-kind=postgresql
quarkus.datasource.jobs_service.devservices.enabled=false
quarkus.datasource."jobs_service".db-kind=postgresql
quarkus.datasource."jobs_service".devservices.enabled=false
quarkus.datasource.devservices.enabled=false
quarkus.flyway.jobs_service.locations=db/jobs-service
quarkus.flyway.jobs_service.migrate-at-start=true
Loading