Skip to content

Commit 160c3fc

Browse files
fantonangelifantonangeli
committed
Merge remote-tracking branch 'upstream/main' into main-sync-20251007-132212
2 parents 6c88679 + e35252e commit 160c3fc

File tree

25 files changed

+391
-91
lines changed

25 files changed

+391
-91
lines changed

‎apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
# under the License.
1818
#
1919

20-
quarkus.kafka.devservices.image-name=${container.image.kafka}
20+
quarkus.kafka.devservices.image-name=${container.image.kafka}

‎data-index/data-index-graphql/src/main/resources/graphql/basic.schema.graphqls‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,10 @@ input UserTaskInstanceArgument {
437437
comments: CommentArgument
438438
attachments: AttachmentArgument
439439
slaDueDate: DateArgument
440+
rootProcessInstanceId: StringArgument
441+
rootProcessId: StringArgument
442+
externalReferenceId: StringArgument
443+
endpoint: StringArgument
440444
}
441445

442446
input CommentArgument {

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
<version>${version.io.quarkus}</version>
6060
</path>
6161
</annotationProcessorPaths>
62-
<compilerArgs>
63-
<arg>-AlegacyConfigRoot=true</arg>
64-
</compilerArgs>
6562
</configuration>
6663
</plugin>
6764
</plugins>

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexBuildConfig.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,22 @@
1818
*/
1919
package org.kie.kogito.index.addon.config;
2020

21-
import io.quarkus.runtime.annotations.ConfigItem;
21+
import java.util.Optional;
22+
2223
import io.quarkus.runtime.annotations.ConfigPhase;
2324
import io.quarkus.runtime.annotations.ConfigRoot;
25+
import io.smallrye.config.ConfigMapping;
2426

25-
@ConfigRoot(name = "kogito.data-index", phase = ConfigPhase.BUILD_TIME)
26-
public class DataIndexBuildConfig {
27+
@ConfigMapping(prefix = "kogito.data-index")
28+
@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
29+
public interface DataIndexBuildConfig {
2730

2831
/**
29-
* If GraphQL UI should be enabled. By default, this is only included when the application is running in dev mode.
32+
* Configures whether to use Reactive or Blocking behaviour for the RouterProducer and EventConsumer components.
33+
* If the property is set, and has the value true, blocking behaviour is configured, and the
34+
* BlockingGraphqlRouterProducer and BlockingMessagingEventConsumer are used.
35+
* In any other case, the ReactiveGraphqlRouterProducer and ReactiveMessagingEventConsumer are used.
3036
*/
31-
@ConfigItem(name = "graphql.ui.always-include", defaultValue = "false")
32-
public boolean graphqlUIEnabled;
37+
Optional<Boolean> blocking();
3338

3439
}

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexConfigBuilderCustomizer.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.kie.kogito.index.addon.config;
20+
21+
import io.smallrye.config.SmallRyeConfigBuilder;
22+
import io.smallrye.config.SmallRyeConfigBuilderCustomizer;
23+
24+
public class DataIndexConfigBuilderCustomizer implements SmallRyeConfigBuilderCustomizer {
25+
26+
@Override
27+
public void configBuilder(SmallRyeConfigBuilder builder) {
28+
// Align with quarkus to avoid the validation issue when we have runtime and build-time configs in the same
29+
// namespace. https://github.com/quarkusio/quarkus/blob/265a4328f8195d9c2ef4fbf32f41eb23253479b7/core/runtime/src/main/java/io/quarkus/runtime/configuration/QuarkusConfigBuilderCustomizer.java#L113
30+
builder.withMappingIgnore("kogito.data-index.**");
31+
}
32+
}

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.java‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,50 @@
2020

2121
import java.util.Optional;
2222

23-
import io.quarkus.runtime.annotations.ConfigItem;
2423
import io.quarkus.runtime.annotations.ConfigPhase;
2524
import io.quarkus.runtime.annotations.ConfigRoot;
25+
import io.smallrye.config.ConfigMapping;
26+
import io.smallrye.config.WithDefault;
27+
import io.smallrye.config.WithName;
2628

27-
@ConfigRoot(prefix = "kogito", name = "data-index", phase = ConfigPhase.RUN_TIME)
28-
public class DataIndexRuntimeConfig {
29+
@ConfigMapping(prefix = "kogito.data-index")
30+
@ConfigRoot(phase = ConfigPhase.RUN_TIME)
31+
public interface DataIndexRuntimeConfig {
2932

3033
/**
31-
* Data Index URL
34+
* Data Index URL.
3235
*/
33-
@ConfigItem(name = "url")
34-
public Optional<String> dataIndexUrl;
36+
Optional<String> url();
37+
38+
/**
39+
* Path to the Data Index web application if any.
40+
*/
41+
@WithName("ui.path")
42+
Optional<String> uiPath();
43+
44+
/**
45+
* Path for publishing the Graphql UI.
46+
*/
47+
@WithName("vertx-graphql.ui.path")
48+
@WithDefault("/graphiql")
49+
String graphqlUIPath();
50+
51+
/**
52+
* Graphql UI tenant.
53+
*/
54+
@WithName("vertx-graphql.ui.tenant")
55+
@WithDefault("web-app-tenant")
56+
String graphqlUITenant();
57+
58+
/**
59+
* Domain Objects indexing.
60+
*/
61+
@WithDefault("true")
62+
boolean domainIndexing();
63+
64+
/**
65+
* Availability health check enabling.
66+
*/
67+
Optional<Boolean> healthEnabled();
3568

3669
}

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.java‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,28 @@
1818
*/
1919
package org.kie.kogito.index.addon.config;
2020

21-
import io.quarkus.runtime.annotations.ConfigItem;
2221
import io.quarkus.runtime.annotations.ConfigPhase;
2322
import io.quarkus.runtime.annotations.ConfigRoot;
23+
import io.smallrye.config.ConfigMapping;
24+
import io.smallrye.config.WithDefault;
25+
import io.smallrye.config.WithName;
2426

25-
@ConfigRoot(prefix = "kogito", name = "dataindex", phase = ConfigPhase.RUN_TIME)
26-
public class DataIndexUIClientRuntimeConfig {
27+
@ConfigMapping(prefix = "kogito.dataindex")
28+
@ConfigRoot(phase = ConfigPhase.RUN_TIME)
29+
public interface DataIndexUIClientRuntimeConfig {
2730

2831
/**
29-
* Data Index HTTP URL
32+
* Data Index HTTP URL.
3033
*/
31-
@ConfigItem(name = "http.url", defaultValue = "http://localhost:${quarkus.http.port}")
32-
public String dataIndexHttpUrl;
34+
@WithName("http.url")
35+
@WithDefault("http://localhost:${quarkus.http.port}")
36+
String dataIndexHttpUrl();
3337

3438
/**
35-
* Data Index WS URL
39+
* Data Index WS URL.
3640
*/
37-
@ConfigItem(name = "ws.url", defaultValue = "ws://localhost:${quarkus.http.port}")
38-
public String dataIndexWebsocketUrl;
41+
@WithName("ws.url")
42+
@WithDefault("ws://localhost:${quarkus.http.port}")
43+
String dataIndexWebsocketUrl();
3944

4045
}

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/QuarkusDataIndexBuildConfig.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.kie.kogito.index.addon.config;
20+
21+
import io.quarkus.runtime.annotations.ConfigPhase;
22+
import io.quarkus.runtime.annotations.ConfigRoot;
23+
import io.smallrye.config.ConfigMapping;
24+
import io.smallrye.config.WithDefault;
25+
import io.smallrye.config.WithName;
26+
27+
/**
28+
* We keep this class for backward compatibility purposes.
29+
* Avoid using quarkus.kogito.data-index prefixed properties unless there's a strong reason.
30+
* see: DataIndexBuildConfig.
31+
*/
32+
@ConfigMapping(prefix = "quarkus.kogito.data-index")
33+
@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
34+
public interface QuarkusDataIndexBuildConfig {
35+
36+
/**
37+
* If GraphQL UI should be enabled. By default, this is only included when the application is running in dev mode.
38+
*/
39+
@WithName("graphql.ui.always-include")
40+
@WithDefault("false")
41+
boolean graphqlUiAlwaysInclude();
42+
43+
}

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/resources/META-INF/services/io.smallrye.config.SmallRyeConfigBuilderCustomizer‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
org.kie.kogito.index.addon.config.DataIndexConfigBuilderCustomizer

‎data-index/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/deployment/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@
6868
<version>${version.io.quarkus}</version>
6969
</path>
7070
</annotationProcessorPaths>
71-
<compilerArgs>
72-
<arg>-AlegacyConfigRoot=true</arg>
73-
</compilerArgs>
7471
</configuration>
7572
</plugin>
7673
</plugins>

0 commit comments

Comments
 (0)