Skip to content

Commit 64bbe68

Browse files
committed
review comments fixes
1 parent 2a28c8b commit 64bbe68

File tree

21 files changed

+51
-89
lines changed

21 files changed

+51
-89
lines changed

addons/common/jbpm-usertask-storage-jpa/src/main/java/org/jbpm/usertask/jpa/mapper/TaskInputsEntityMapper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ public void mapInstanceToEntity(UserTaskInstance userTaskInstance, UserTaskInsta
6464
inputEntity.setValue(JSONUtils.valueToString(value).getBytes(StandardCharsets.UTF_8));
6565
inputEntity.setJavaType(value.getClass().getName());
6666
}
67-
// Hibernate 7.1.14.Final (Quarkus 3.27.2): Removed explicit repository.persist(inputEntity) call.
68-
// Hibernate 7.x enforces that child entities referencing a transient (unsaved) parent must not be
69-
// persisted before the parent. The parent UserTaskInstanceEntity has @OneToMany(cascade = CascadeType.ALL),
67+
// No explicit persist needed: parent has @OneToMany(cascade = CascadeType.ALL),
7068
// so child entities are automatically persisted when the parent is saved.
7169
});
7270
}

addons/common/jbpm-usertask-storage-jpa/src/main/java/org/jbpm/usertask/jpa/mapper/TaskMetadataEntityMapper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ public void mapInstanceToEntity(UserTaskInstance userTaskInstance, UserTaskInsta
6363
metadataEntity.setValue(JSONUtils.valueToString(value));
6464
metadataEntity.setJavaType(value.getClass().getName());
6565
}
66-
// Hibernate 7.1.14.Final (Quarkus 3.27.2): Removed explicit repository.persist(metadataEntity) call.
67-
// Hibernate 7.x enforces that child entities referencing a transient (unsaved) parent must not be
68-
// persisted before the parent. The parent UserTaskInstanceEntity has @OneToMany(cascade = CascadeType.ALL),
66+
// No explicit persist needed: parent has @OneToMany(cascade = CascadeType.ALL),
6967
// so child entities are automatically persisted when the parent is saved.
7068
});
7169
}

addons/common/jbpm-usertask-storage-jpa/src/main/java/org/jbpm/usertask/jpa/mapper/TaskOutputsEntityMapper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ public void mapInstanceToEntity(UserTaskInstance userTaskInstance, UserTaskInsta
6464
outputEntity.setValue(JSONUtils.valueToString(value).getBytes(StandardCharsets.UTF_8));
6565
outputEntity.setJavaType(value.getClass().getName());
6666
}
67-
// Hibernate 7.1.14.Final (Quarkus 3.27.2): Removed explicit repository.persist(outputEntity) call.
68-
// Hibernate 7.x enforces that child entities referencing a transient (unsaved) parent must not be
69-
// persisted before the parent. The parent UserTaskInstanceEntity has @OneToMany(cascade = CascadeType.ALL),
67+
// No explicit persist needed: parent has @OneToMany(cascade = CascadeType.ALL),
7068
// so child entities are automatically persisted when the parent is saved.
7169
});
7270
}

addons/common/persistence/postgresql/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@
5353
<groupId>io.vertx</groupId>
5454
<artifactId>vertx-pg-client</artifactId>
5555
</dependency>
56-
<!-- Quarkus 3.27.2 / Vert.x 4.5.23 upgrade: SCRAM authentication for PostgreSQL 16+.
57-
Artifact renamed from com.ongres.scram:client (2.x) to com.ongres.scram:scram-client (3.x).
58-
Required at runtime for SASL authentication; Vert.x declares it as optional. -->
56+
<!-- Required at runtime for SASL authentication; Vert.x declares it as optional -->
5957
<dependency>
6058
<groupId>com.ongres.scram</groupId>
6159
<artifactId>scram-client</artifactId>

kogito-build/kogito-build-no-bom-parent/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,12 @@
106106
<version.rpkgtests.maven.plugin>1.0.0</version.rpkgtests.maven.plugin>
107107
<version.resources.plugin>3.1.0</version.resources.plugin>
108108
<version.site.plugin>3.7.1</version.site.plugin>
109-
<version.shade.plugin>3.0.0</version.shade.plugin>
109+
<version.shade.plugin>3.3.0</version.shade.plugin>
110110
<version.sonar.plugin>3.6.1.1688</version.sonar.plugin>
111111
<version.source.plugin>3.2.1</version.source.plugin>
112112
<version.surefire.plugin>3.3.1</version.surefire.plugin> <!-- minimum required by JUnit 5 -->
113113
<version.surefire.report.plugin>3.1.2</version.surefire.report.plugin>
114114
<version.taglist.plugin>2.4</version.taglist.plugin>
115-
<!-- Versions plugin should stay on version 2.5
116-
until https://github.com/mojohaus/versions-maven-plugin/issues/312 is fixed -->
117115
<version.versions.plugin>2.5</version.versions.plugin>
118116
<version.org.jsonschema2pojo-maven-plugin>1.0.1</version.org.jsonschema2pojo-maven-plugin>
119117
<version.org.codehaus.gmavenplus.plugin>1.5</version.org.codehaus.gmavenplus.plugin>

kogito-build/kogito-dependencies-bom/pom.xml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
<version.com.fasterxml.jackson>2.19.2</version.com.fasterxml.jackson>
5454
<version.com.fasterxml.jackson.databind>2.19.2</version.com.fasterxml.jackson.databind>
5555
<version.com.jayway.jsonpath>2.9.0</version.com.jayway.jsonpath>
56-
<!-- Quarkus 3.27.2 upgrade: Vert.x 4.5.23 requires scram-client 3.2 (not client 2.1).
57-
The artifact was renamed from com.ongres.scram:client (2.x) to com.ongres.scram:scram-client (3.x). -->
5856
<version.com.ongres.scram>3.2</version.com.ongres.scram>
5957
<version.net.minidev.jsonsmart>2.4.10</version.net.minidev.jsonsmart>
6058
<version.net.thisptr.jackson-jq>1.0.0-preview.20240207</version.net.thisptr.jackson-jq>
@@ -64,7 +62,7 @@
6462
<version.io.quarkiverse.reactivemessaging.http>2.5.0-lts</version.io.quarkiverse.reactivemessaging.http>
6563
<version.io.quarkiverse.embedded.postgresql>0.7.2</version.io.quarkiverse.embedded.postgresql>
6664
<version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>
67-
<version.com.github.javaparser>3.26.4</version.com.github.javaparser>
65+
<version.com.github.javaparser>3.27.0</version.com.github.javaparser>
6866
<version.com.fasterxml.jackson.datatype>2.19.2</version.com.fasterxml.jackson.datatype>
6967
<version.com.github.victools>4.37.0</version.com.github.victools>
7068
<version.org.wiremock>3.13.0</version.org.wiremock>
@@ -90,10 +88,6 @@
9088
Kubernetes addons since they use a different version.
9189
-->
9290
<version.io.fabric8.kubernetes-client>7.3.1</version.io.fabric8.kubernetes-client>
93-
<!-- Quarkus 3.27.2 upgrade: version.io.fabric8.openshift-mock property removed.
94-
The openshift-server-mock artifact was removed in Fabric8 7.x (see MIGRATION-v7.md).
95-
Use io.fabric8:kubernetes-server-mock instead, which is already declared below
96-
at version ${version.io.fabric8.kubernetes-client}. -->
9791
<version.io.micrometer>1.14.12</version.io.micrometer>
9892
<version.org.flywaydb>11.14.1</version.org.flywaydb>
9993
<version.org.postgresql>42.7.8</version.org.postgresql>
@@ -136,7 +130,7 @@
136130
<version.org.mongo-image>5.0.31</version.org.mongo-image>
137131
<version.org.mozilla.rhino>1.8.1</version.org.mozilla.rhino>
138132
<version.org.redis>2.0.4</version.org.redis>
139-
<!-- Upgraded from 15.9-alpine3.20 to 16.8-alpine3.21 for Quarkus 3.20+ compatibility - PostgreSQL 16.8+ required for SASL authentication protocol -->
133+
<!-- PostgreSQL 16.8+ required for SASL authentication protocol -->
140134
<version.org.postgres>16.8-alpine3.21</version.org.postgres>
141135
<!-- we align to version used by quarkus -->
142136
<version.org.apache.avro>1.12.0</version.org.apache.avro>
@@ -157,7 +151,7 @@
157151
<version.org.mvel>2.5.2.Final</version.org.mvel>
158152
<version.org.reactivestreams>1.0.4</version.org.reactivestreams>
159153
<version.org.reflections>0.10.2</version.org.reflections>
160-
<version.org.slf4j>2.0.6</version.org.slf4j>
154+
<version.org.slf4j>2.0.17</version.org.slf4j>
161155

162156
<version.maven>3.9.11</version.maven>
163157
<version.maven.project>2.2.1</version.maven.project>
@@ -833,10 +827,6 @@
833827
<version>${version.io.fabric8.kubernetes-client}</version>
834828
</dependency>
835829

836-
<!-- Quarkus 3.27.2 upgrade: Removed io.fabric8:openshift-server-mock dependency.
837-
The artifact was removed in Fabric8 7.x. Use io.fabric8:kubernetes-server-mock (above)
838-
with KubernetesMockServer + client.adapt(OpenShiftClient.class) instead of OpenShiftMockServer. -->
839-
840830
<dependency>
841831
<groupId>org.junit.jupiter</groupId>
842832
<artifactId>junit-jupiter-api</artifactId>
@@ -981,9 +971,7 @@
981971
<version>${version.org.wiremock}</version>
982972
<scope>test</scope>
983973
</dependency>
984-
<!-- Quarkus 3.27.2 / Vert.x 4.5.23 upgrade: SCRAM authentication for PostgreSQL 16+.
985-
Artifact renamed from com.ongres.scram:client (2.x) to com.ongres.scram:scram-client (3.x).
986-
Vert.x 4.5.23 was compiled against scram-client 3.2 API (ScramClient$MechanismsBuildStage). -->
974+
<!-- SCRAM authentication for PostgreSQL 16+; required by Vert.x reactive pg-client -->
987975
<dependency>
988976
<groupId>com.ongres.scram</groupId>
989977
<artifactId>scram-client</artifactId>

quarkus/addons/asyncapi/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfo;
2828
import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfoConverter;
2929

30-
// Updated to AsyncAPI v3.0.0 (from v2.0.0) as part of Quarkus 3.27.2 upgrade
3130
import com.asyncapi.v3._0_0.model.AsyncAPI;
3231
import com.asyncapi.v3._0_0.model.channel.Channel;
3332
import com.asyncapi.v3._0_0.model.operation.Operation;
@@ -54,7 +53,9 @@ private static AsyncInfo from(AsyncAPI asyncApi) {
5453
return new AsyncInfo(channelInfoByOperationId);
5554
}
5655

57-
// AsyncAPI v3.0.0: channels are separate top-level objects with addresses
56+
/**
57+
* Builds a mapping from channel ID to its address from the AsyncAPI channels.
58+
*/
5859
private static Map<String, String> buildChannelAddressMap(AsyncAPI asyncApi) {
5960
Map<String, String> channelIdToAddress = new HashMap<>();
6061
if (asyncApi.getChannels() != null) {
@@ -69,7 +70,9 @@ private static Map<String, String> buildChannelAddressMap(AsyncAPI asyncApi) {
6970
return channelIdToAddress;
7071
}
7172

72-
// AsyncAPI v3.0.0: operations reference channels via $ref, action is SEND/RECEIVE
73+
/**
74+
* Builds a mapping from operation ID to {@link AsyncChannelInfo} by resolving channel references.
75+
*/
7376
private static Map<String, AsyncChannelInfo> buildOperationChannelInfoMap(AsyncAPI asyncApi, Map<String, String> channelIdToAddress) {
7477
Map<String, AsyncChannelInfo> channelInfoByOperationId = new HashMap<>();
7578
if (asyncApi.getOperations() != null) {

quarkus/addons/grpc/deployment/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<groupId>io.quarkus</groupId>
5959
<artifactId>quarkus-grpc-deployment</artifactId>
6060
</dependency>
61-
<!-- Quarkus 3.27.2 upgrade: Explicit dependency now required -->
6261
<dependency>
6362
<groupId>io.quarkus</groupId>
6463
<artifactId>quarkus-devtools-utilities</artifactId>

quarkus/addons/knative/serving/integration-tests/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/it/KnativeServingAddonIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import static org.kie.kogito.addons.quarkus.knative.serving.customfunctions.KnativeWorkItemHandler.APPLICATION_CLOUDEVENTS_JSON_CHARSET_UTF_8;
5353

5454
@QuarkusTest
55-
// Quarkus 3.27.2 upgrade: Fabric8 7.x - replaced @WithKubernetesTestServer with @QuarkusTestResource
5655
@QuarkusTestResource(KubernetesMockServerTestResource.class)
5756
class KnativeServingAddonIT {
5857

quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@
3434
import static org.assertj.core.api.Assertions.assertThat;
3535
import static org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils.createKnativeServiceIfNotExists;
3636

37-
/**
38-
* Quarkus 3.27.2 / Fabric8 7.3.1 upgrade:
39-
* - Replaced explicit mock server .expect() calls with createKnativeServiceIfNotExists(),
40-
* which works with Fabric8 7.x CRUD-mode mock server (auto-handles CRUD operations).
41-
* - Uses createKnativeServiceIfNotExists() in @BeforeEach to avoid 409 Conflict when the
42-
* CRUD-mode server persists resources across test methods.
43-
*/
4437
@QuarkusTest
4538
@QuarkusTestResource(KubernetesMockServerTestResource.class)
4639
class KubeDiscoveryConfigCacheUpdaterTest {

0 commit comments

Comments
 (0)