You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ti...@apache.org on 2023/12/23 20:23:10 UTC
(incubator-kie-kogito-apps) branch main updated: ISSUE-1942 Jobs Service Embedded Addon do not allow to override the kogito.service.url parameter (#1943)
This is an automated email from the ASF dual-hosted git repository.
tiagodolphine pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 3d94e161a ISSUE-1942 Jobs Service Embedded Addon do not allow to override the kogito.service.url parameter (#1943)
3d94e161a is described below
commit 3d94e161a429c355209a2cc0869742bf96b7559c
Author: Tiago Dolphine <ti...@gmail.com>
AuthorDate: Sat Dec 23 17:23:05 2023 -0300
ISSUE-1942 Jobs Service Embedded Addon do not allow to override the kogito.service.url parameter (#1943)
* ISSUE-1942 Jobs Service Embedded Addon do not allow to override the kogito.service.url parameter
---
.../src/main/resources/application.properties | 2 --
.../src/main/resources/application.properties | 2 --
.../src/main/resources/application.properties | 2 --
.../src/main/resources/META-INF/microprofile-config.properties | 1 -
.../src/test/resources/application.properties | 1 -
.../src/test/resources/application.properties | 1 -
.../src/test/resources/application.properties | 1 -
.../src/test/resources/application.properties | 1 -
.../src/test/resources/application.properties | 1 -
.../KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java | 4 ----
.../KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java | 9 ++-------
.../KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java | 5 ++++-
12 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties
index c5b50e522..1369f55ab 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties
@@ -17,8 +17,6 @@
# under the License.
#
-kogito.service.url=http://localhost:8080
-
# Disable the KSinkInjectionHealthCheck since the K_SINK env variable is not passed in this context.
quarkus.smallrye-health.check."org.kie.kogito.addons.quarkus.knative.eventing.KSinkInjectionHealthCheck".enabled=false
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties
index 8d35e2fec..84f5cd570 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties
@@ -17,8 +17,6 @@
# under the License.
#
-kogito.service.url=http://localhost:8080
-
quarkus.log.category."org.kie.kogito.jobs.management.quarkus".level=DEBUG
quarkus.kafka.devservices.enabled=false
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
index b215aedc6..6d4d2895a 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
@@ -17,8 +17,6 @@
# under the License.
#
-kogito.service.url=http://localhost:8080
-
quarkus.log.category."org.kie.kogito.jobs.messaging.quarkus".level=DEBUG
quarkus.kafka.devservices.enabled=false
diff --git a/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties b/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties
index 8e81e4c9c..205ccc925 100644
--- a/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties
+++ b/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties
@@ -42,7 +42,6 @@ mp.openapi.filter=org.kie.kogito.jobs.service.openapi.JobServiceModelFilter
# Job Service
kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
kogito.jobs-service.schedulerChunkInMinutes=10
kogito.jobs-service.loadJobIntervalInMinutes=10
kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=60
diff --git a/jobs-service/jobs-service-common/src/test/resources/application.properties b/jobs-service/jobs-service-common/src/test/resources/application.properties
index 24ef88d13..98d99c279 100644
--- a/jobs-service/jobs-service-common/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-common/src/test/resources/application.properties
@@ -19,7 +19,6 @@
kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
kogito.jobs-service.schedulerChunkInMinutes=10
kogito.jobs-service.loadJobIntervalInMinutes=10
kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0
diff --git a/jobs-service/jobs-service-infinispan/src/test/resources/application.properties b/jobs-service/jobs-service-infinispan/src/test/resources/application.properties
index cea17e1e2..50e3609e1 100644
--- a/jobs-service/jobs-service-infinispan/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-infinispan/src/test/resources/application.properties
@@ -19,7 +19,6 @@
kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
kogito.jobs-service.schedulerChunkInMinutes=10
kogito.jobs-service.loadJobIntervalInMinutes=10
kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0
diff --git a/jobs-service/jobs-service-mongodb/src/test/resources/application.properties b/jobs-service/jobs-service-mongodb/src/test/resources/application.properties
index 75d5c092e..d5ef30532 100644
--- a/jobs-service/jobs-service-mongodb/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-mongodb/src/test/resources/application.properties
@@ -19,7 +19,6 @@
kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
kogito.jobs-service.schedulerChunkInMinutes=10
kogito.jobs-service.loadJobIntervalInMinutes=10
kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties b/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties
index 9c0e69df9..bad50b300 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties
@@ -19,7 +19,6 @@
kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
kogito.jobs-service.schedulerChunkInMinutes=10
kogito.jobs-service.loadJobIntervalInMinutes=10
kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0
diff --git a/jobs-service/jobs-service-postgresql/src/test/resources/application.properties b/jobs-service/jobs-service-postgresql/src/test/resources/application.properties
index 15110b282..a1cacb6cf 100644
--- a/jobs-service/jobs-service-postgresql/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-postgresql/src/test/resources/application.properties
@@ -19,7 +19,6 @@
kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
kogito.jobs-service.schedulerChunkInMinutes=10
kogito.jobs-service.loadJobIntervalInMinutes=10
kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java
index e2df73e3c..a12b03e87 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java
@@ -40,8 +40,6 @@ import static org.kie.kogito.addons.quarkus.jobs.service.embedded.stream.EventPu
class KogitoAddonsQuarkusJobsServiceEmbeddedProcessor extends OneOfCapabilityKogitoAddOnProcessor {
private static final String FEATURE = "kogito-addons-quarkus-jobs-service-embedded";
- private static final String JOBS_SERVICE_URL = "kogito.jobs-service.url";
- private static final String SERVICE_URL = "kogito.service.url";
private static final String DATA_SOURCE_NAME = "jobs_service";
private static final String DATA_SOURCE_NAME_KEY = "datasource.name";
@@ -56,8 +54,6 @@ class KogitoAddonsQuarkusJobsServiceEmbeddedProcessor extends OneOfCapabilityKog
@BuildStep
void buildConfiguration(BuildProducer<SystemPropertyBuildItem> systemProperties) {
- systemProperties.produce(new SystemPropertyBuildItem(SERVICE_URL, "http://${quarkus.http.host}:${quarkus.http.port}"));
- systemProperties.produce(new SystemPropertyBuildItem(JOBS_SERVICE_URL, "${" + SERVICE_URL + "}"));
systemProperties.produce(new SystemPropertyBuildItem(DATA_SOURCE_NAME_KEY, DATA_SOURCE_NAME));
}
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java
index 220d923f2..d85b176f8 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java
@@ -45,11 +45,7 @@ import static org.mockito.Mockito.verify;
@ExtendWith(MockitoExtension.class)
class KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest {
- private static final String JOBS_SERVICE_URL = "kogito.jobs-service.url";
- private static final String SERVICE_URL = "kogito.service.url";
-
private KogitoAddonsQuarkusJobsServiceEmbeddedProcessor processor;
-
@Mock
private BuildProducer<SystemPropertyBuildItem> systemPropertyBuildItemBuildProducer;
@Captor
@@ -77,11 +73,10 @@ class KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest {
@Test
void buildConfiguration() {
processor.buildConfiguration(systemPropertyBuildItemBuildProducer);
- verify(systemPropertyBuildItemBuildProducer, times(3)).produce(systemPropertyBuildItemCaptor.capture());
+ verify(systemPropertyBuildItemBuildProducer, times(1)).produce(systemPropertyBuildItemCaptor.capture());
List<SystemPropertyBuildItem> items = systemPropertyBuildItemCaptor.getAllValues();
assertThat(items)
- .anyMatch(item -> JOBS_SERVICE_URL.equals(item.getKey()) && ("${" + SERVICE_URL + "}").equals(item.getValue()))
- .anyMatch(item -> SERVICE_URL.equals(item.getKey()) && "http://${quarkus.http.host}:${quarkus.http.port}".equals(item.getValue()));
+ .anyMatch(item -> "datasource.name".equals(item.getKey()) && ("jobs_service").equals(item.getValue()));
}
@Test
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java
index beb55947a..bd005f5a7 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java
@@ -28,12 +28,15 @@ public class KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource implements Confi
private static final String KAFKA_DEV_SERVICES = "quarkus.kafka.devservices.enabled";
private static final String DATASOURCE_DEV_SERVICES = "quarkus.datasource.devservices.enabled";
-
+ private static final String JOBS_SERVICE_URL = "kogito.jobs-service.url";
+ private static final String SERVICE_URL = "kogito.service.url";
private static final Map<String, String> DEFAULT_CONFIG = new HashMap<>();
static {
DEFAULT_CONFIG.put(KAFKA_DEV_SERVICES, "false");
DEFAULT_CONFIG.put(DATASOURCE_DEV_SERVICES, "false");
+ DEFAULT_CONFIG.put(SERVICE_URL, "http://localhost:${quarkus.http.port}");
+ DEFAULT_CONFIG.put(JOBS_SERVICE_URL, "${" + SERVICE_URL + "}");
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org