From e943195ee510b90cec636d2b8af516431accb628 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Tue, 22 Oct 2024 12:07:57 +0530 Subject: [PATCH] Upgrade quarkus to 3.15 --- addons/common/persistence/infinispan/pom.xml | 2 +- .../state/AsyncEventNodeInstanceWriter.java | 2 +- .../CompositeContextNodeInstanceWriter.java | 2 +- .../state/DynamicNodeInstanceWriter.java | 2 +- .../state/EventNodeInstanceWriter.java | 2 +- .../EventSubProcessNodeInstanceWriter.java | 2 +- .../state/ForEachNodeInstanceWriter.java | 2 +- .../state/JoinNodeInstanceWriter.java | 2 +- .../LambdaSubProcessNodeInstanceWriter.java | 2 +- .../state/MilestoneNodeInstanceWriter.java | 2 +- .../state/RuleSetNodeInstanceWriter.java | 2 +- .../state/StateNodeInstanceWriter.java | 2 +- .../state/SubProcessNodeInstanceWriter.java | 2 +- .../state/TimerNodeInstanceWriter.java | 2 +- .../state/WorkItemNodeInstanceWriter.java | 2 +- ...rotostreamProtobufAdapterTypeProvider.java | 2 +- kogito-build/kogito-dependencies-bom/pom.xml | 22 ++++++---- .../kogito-codegen-processes/pom.xml | 4 ++ .../AbstractMarshallerGenerator.java | 43 +++++-------------- .../AbstractMarshallerGeneratorTest.java | 2 +- quarkus/addons/camel/deployment/pom.xml | 3 ++ quarkus/addons/camel/runtime/pom.xml | 3 ++ quarkus/addons/dynamic/deployment/pom.xml | 3 ++ .../addons/dynamic/integration-tests/pom.xml | 4 ++ quarkus/addons/dynamic/runtime/pom.xml | 3 ++ .../events/decisions/deployment/pom.xml | 3 ++ .../addons/events/mongodb/deployment/pom.xml | 3 ++ .../events/predictions/deployment/pom.xml | 3 ++ quarkus/addons/events/process/runtime/pom.xml | 3 ++ quarkus/addons/explainability/runtime/pom.xml | 3 ++ .../deployment/pom.xml | 3 ++ .../runtime/pom.xml | 3 ++ quarkus/addons/flyway/deployment/pom.xml | 3 ++ quarkus/addons/flyway/runtime/pom.xml | 3 ++ ...AddOnJobsKnativeEventingProcessorTest.java | 2 +- .../addons/jobs/messaging/deployment/pom.xml | 3 ++ .../knative/eventing/deployment/pom.xml | 3 ++ ...gitoAddOnKnativeEventingProcessorTest.java | 2 +- .../eventing/integration-tests/pom.xml | 4 ++ .../addons/knative/eventing/runtime/pom.xml | 3 ++ .../addons/knative/serving/deployment/pom.xml | 3 ++ .../addons/knative/serving/runtime/pom.xml | 3 ++ .../persistence/infinispan/runtime/pom.xml | 3 ++ .../persistence/postgresql/runtime/pom.xml | 3 ++ .../persistence/rocksdb/runtime/pom.xml | 3 ++ .../integration-tests/pom.xml | 4 ++ .../addons/process-management/runtime/pom.xml | 3 ++ .../kogito-quarkus-common-deployment/pom.xml | 2 +- .../kogito-quarkus-common/pom.xml | 3 ++ .../kogito-quarkus-rules-deployment/pom.xml | 3 ++ .../kogito-quarkus-rules/pom.xml | 3 ++ .../pom.xml | 15 ++++++- .../pom.xml | 9 ++-- .../pom.xml | 3 ++ 54 files changed, 156 insertions(+), 67 deletions(-) diff --git a/addons/common/persistence/infinispan/pom.xml b/addons/common/persistence/infinispan/pom.xml index 436eb882c18..609f06d9732 100644 --- a/addons/common/persistence/infinispan/pom.xml +++ b/addons/common/persistence/infinispan/pom.xml @@ -50,7 +50,7 @@ org.infinispan - infinispan-client-hotrod-jakarta + infinispan-client-hotrod org.kie.kogito diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/AsyncEventNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/AsyncEventNodeInstanceWriter.java index 69445449f61..ee1fc0a2311 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/AsyncEventNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/AsyncEventNodeInstanceWriter.java @@ -24,7 +24,7 @@ import org.jbpm.workflow.core.node.AsyncEventNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class AsyncEventNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/CompositeContextNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/CompositeContextNodeInstanceWriter.java index e80f7179ce6..a8d575041e6 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/CompositeContextNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/CompositeContextNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.CompositeContextNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class CompositeContextNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/DynamicNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/DynamicNodeInstanceWriter.java index 325268fbd80..cb895525060 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/DynamicNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/DynamicNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.DynamicNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class DynamicNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventNodeInstanceWriter.java index 6d4cd4216f1..15bd7669202 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventNodeInstanceWriter.java @@ -24,7 +24,7 @@ import org.jbpm.workflow.instance.node.EventNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class EventNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventSubProcessNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventSubProcessNodeInstanceWriter.java index 10cc62573ab..3baf4533035 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventSubProcessNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/EventSubProcessNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.EventSubProcessNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class EventSubProcessNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/ForEachNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/ForEachNodeInstanceWriter.java index 4051e5534e1..c2583ea2614 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/ForEachNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/ForEachNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.ForEachNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class ForEachNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/JoinNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/JoinNodeInstanceWriter.java index 041150d1d06..9d3092b0094 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/JoinNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/JoinNodeInstanceWriter.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class JoinNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/LambdaSubProcessNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/LambdaSubProcessNodeInstanceWriter.java index 31178c2f6c2..c8b1fa7c8dd 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/LambdaSubProcessNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/LambdaSubProcessNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.LambdaSubProcessNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class LambdaSubProcessNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/MilestoneNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/MilestoneNodeInstanceWriter.java index 3a6bfc694dc..1622cc08681 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/MilestoneNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/MilestoneNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.MilestoneNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class MilestoneNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/RuleSetNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/RuleSetNodeInstanceWriter.java index 8b86f45a294..2daa50b4c64 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/RuleSetNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/RuleSetNodeInstanceWriter.java @@ -24,7 +24,7 @@ import org.jbpm.workflow.instance.node.RuleSetNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class RuleSetNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/StateNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/StateNodeInstanceWriter.java index a9ff770c2e1..401b8e3c1d3 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/StateNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/StateNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.StateNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class StateNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/SubProcessNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/SubProcessNodeInstanceWriter.java index c53fc1e0816..885c3a01be8 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/SubProcessNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/SubProcessNodeInstanceWriter.java @@ -26,7 +26,7 @@ import org.jbpm.workflow.instance.node.SubProcessNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class SubProcessNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/TimerNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/TimerNodeInstanceWriter.java index 67d5e5ac4cd..92a44bac453 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/TimerNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/TimerNodeInstanceWriter.java @@ -24,7 +24,7 @@ import org.jbpm.workflow.instance.node.TimerNodeInstance; import org.kie.api.runtime.process.NodeInstance; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class TimerNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/WorkItemNodeInstanceWriter.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/WorkItemNodeInstanceWriter.java index 1c28f5b9bb8..256c5880d55 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/WorkItemNodeInstanceWriter.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/impl/marshallers/state/WorkItemNodeInstanceWriter.java @@ -29,7 +29,7 @@ import org.kie.api.runtime.process.NodeInstance; import org.kie.kogito.internal.process.workitem.KogitoWorkItem; -import com.google.protobuf.GeneratedMessageV3.Builder; +import com.google.protobuf.GeneratedMessage.Builder; public class WorkItemNodeInstanceWriter implements NodeInstanceWriter { diff --git a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java index 32a670c929c..348acac59b7 100644 --- a/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java +++ b/jbpm/process-serialization-protobuf/src/main/java/org/jbpm/flow/serialization/protobuf/ProtostreamProtobufAdapterTypeProvider.java @@ -183,7 +183,7 @@ private FieldDescriptorProto buildFieldDescriptor(FieldDescriptor descriptor) { } } fieldBuilder.setLabel(descriptor.getLabel() == Label.ONE_OF ? FieldDescriptorProto.Label.LABEL_OPTIONAL : FieldDescriptorProto.Label.valueOf("LABEL_" + descriptor.getLabel().name())); - fieldBuilder.setProto3Optional(!descriptor.isRequired()); + fieldBuilder.setProto3Optional(descriptor.getLabel() != Label.REQUIRED); return fieldBuilder.build(); } diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml index 26fae00aa0d..2cf377679c1 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml @@ -35,7 +35,7 @@ - 3.8.6 + 3.15.1 ${version.io.quarkus} 3.2.6 3.7.0 @@ -50,7 +50,7 @@ 2.4.10 1.0.0-preview.20240207 2.0.2 - 2.4.1 + 2.5.0 0.3.0 2.4.1 0.2.3 @@ -59,7 +59,7 @@ 2.17.2 4.31.0 2.35.1 - 3.25.5 + 4.27.3 2.10.1 @@ -102,8 +102,8 @@ 23.1.2 - 14.0.27.Final - 4.6.5.Final + 15.0.8.Final + 5.0.8.Final 7.10.2 @@ -112,7 +112,7 @@ 24.0.4 2.12-2.2.1 - 4.11.1 + 5.1.4 4.4.14 1.7.13 2.0.4 @@ -128,7 +128,7 @@ 5.10.2 1.10.2 5.8.0 - 1.19.6 + 1.20.1 2.10.0 5.4.0 @@ -721,7 +721,7 @@ org.infinispan - infinispan-client-hotrod-jakarta + infinispan-client-hotrod ${version.org.infinispan} @@ -739,7 +739,11 @@ protostream ${version.org.infinispan.protostream} - + + org.infinispan.protostream + protostream-processor + ${version.org.infinispan.protostream} + org.rocksdb diff --git a/kogito-codegen-modules/kogito-codegen-processes/pom.xml b/kogito-codegen-modules/kogito-codegen-processes/pom.xml index f3f05a38a1a..ecf6c51ee31 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/pom.xml +++ b/kogito-codegen-modules/kogito-codegen-processes/pom.xml @@ -71,6 +71,10 @@ org.infinispan.protostream protostream + + org.infinispan.protostream + protostream-processor + com.github.javaparser javaparser-symbol-solver-core diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java index ac695481d2c..cb4649373af 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGenerator.java @@ -20,14 +20,8 @@ import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.NoSuchElementException; -import java.util.UUID; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -36,11 +30,7 @@ import org.infinispan.protostream.FileDescriptorSource; import org.infinispan.protostream.SerializationContext; import org.infinispan.protostream.config.Configuration; -import org.infinispan.protostream.descriptors.Descriptor; -import org.infinispan.protostream.descriptors.EnumDescriptor; -import org.infinispan.protostream.descriptors.FieldDescriptor; -import org.infinispan.protostream.descriptors.FileDescriptor; -import org.infinispan.protostream.descriptors.Option; +import org.infinispan.protostream.descriptors.*; import org.infinispan.protostream.impl.SerializationContextImpl; import org.kie.kogito.codegen.api.context.KogitoBuildContext; import org.kie.kogito.codegen.api.context.impl.JavaKogitoBuildContext; @@ -54,25 +44,8 @@ import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; -import com.github.javaparser.ast.expr.BinaryExpr; -import com.github.javaparser.ast.expr.CastExpr; -import com.github.javaparser.ast.expr.ClassExpr; -import com.github.javaparser.ast.expr.EnclosedExpr; -import com.github.javaparser.ast.expr.Expression; -import com.github.javaparser.ast.expr.IntegerLiteralExpr; -import com.github.javaparser.ast.expr.MethodCallExpr; -import com.github.javaparser.ast.expr.NameExpr; -import com.github.javaparser.ast.expr.NullLiteralExpr; -import com.github.javaparser.ast.expr.ObjectCreationExpr; -import com.github.javaparser.ast.expr.SimpleName; -import com.github.javaparser.ast.expr.StringLiteralExpr; -import com.github.javaparser.ast.expr.VariableDeclarationExpr; -import com.github.javaparser.ast.stmt.BlockStmt; -import com.github.javaparser.ast.stmt.IfStmt; -import com.github.javaparser.ast.stmt.ReturnStmt; -import com.github.javaparser.ast.stmt.SwitchEntry; -import com.github.javaparser.ast.stmt.SwitchStmt; -import com.github.javaparser.ast.stmt.ThrowStmt; +import com.github.javaparser.ast.expr.*; +import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.ClassOrInterfaceType; import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; @@ -228,7 +201,7 @@ public List generate(FileDescriptorSource proto) throws IOExcep } if (customTypeName.equals(Serializable.class.getName())) { - String fieldClazz = (String) field.getOptionByName(KOGITO_JAVA_CLASS_OPTION); + String fieldClazz = field.getOptionByName(KOGITO_JAVA_CLASS_OPTION).getName(); if (fieldClazz == null) { throw new IllegalArgumentException(format("Serializable proto field '%s' is missing value for option %s", field.getName(), KOGITO_JAVA_CLASS_OPTION)); } else { @@ -317,7 +290,11 @@ public List generate(FileDescriptorSource proto) throws IOExcep } protected String packageFromOption(FileDescriptor d, Descriptor msg) { - return packageFromOption(d, msg.getOption(JAVA_PACKAGE_OPTION)); + Option option = msg.getOptions().stream() + .filter(o -> JAVA_PACKAGE_OPTION.equals(o.getName())) + .findAny() + .orElse(null); + return packageFromOption(d, option); } protected String packageFromOption(FileDescriptor d, EnumDescriptor msg) { diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java index 3004477bdf7..df17b1a8c09 100644 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/process/persistence/marshaller/AbstractMarshallerGeneratorTest.java @@ -81,7 +81,7 @@ void testPersonMarshallers() throws Exception { assertThat(proto.getMessages()).hasSize(1); MarshallerGenerator marshallerGenerator = withGenerator(Person.class); - + proto.serialize(); List classes = marshallerGenerator.generate(proto.serialize()); assertThat(classes).isNotNull().hasSize(1); diff --git a/quarkus/addons/camel/deployment/pom.xml b/quarkus/addons/camel/deployment/pom.xml index a613ae06df0..22ffe09b80e 100644 --- a/quarkus/addons/camel/deployment/pom.xml +++ b/quarkus/addons/camel/deployment/pom.xml @@ -82,6 +82,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/camel/runtime/pom.xml b/quarkus/addons/camel/runtime/pom.xml index a68826951ba..53848a05617 100644 --- a/quarkus/addons/camel/runtime/pom.xml +++ b/quarkus/addons/camel/runtime/pom.xml @@ -90,6 +90,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/dynamic/deployment/pom.xml b/quarkus/addons/dynamic/deployment/pom.xml index 7c4332e4de3..aebebbe291e 100644 --- a/quarkus/addons/dynamic/deployment/pom.xml +++ b/quarkus/addons/dynamic/deployment/pom.xml @@ -70,6 +70,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/dynamic/integration-tests/pom.xml b/quarkus/addons/dynamic/integration-tests/pom.xml index 7109502889e..fc2b6b13058 100644 --- a/quarkus/addons/dynamic/integration-tests/pom.xml +++ b/quarkus/addons/dynamic/integration-tests/pom.xml @@ -23,6 +23,10 @@ org.kie kie-addons-quarkus-process-dynamic + + io.quarkus + quarkus-oidc-client-filter + io.quarkus quarkus-resteasy diff --git a/quarkus/addons/dynamic/runtime/pom.xml b/quarkus/addons/dynamic/runtime/pom.xml index 98c099d0d60..560872c413c 100644 --- a/quarkus/addons/dynamic/runtime/pom.xml +++ b/quarkus/addons/dynamic/runtime/pom.xml @@ -84,6 +84,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/decisions/deployment/pom.xml b/quarkus/addons/events/decisions/deployment/pom.xml index 7a12f4a95e7..b6e9f2b346b 100644 --- a/quarkus/addons/events/decisions/deployment/pom.xml +++ b/quarkus/addons/events/decisions/deployment/pom.xml @@ -64,6 +64,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/mongodb/deployment/pom.xml b/quarkus/addons/events/mongodb/deployment/pom.xml index 36fe75a2786..6d19e6ecb37 100644 --- a/quarkus/addons/events/mongodb/deployment/pom.xml +++ b/quarkus/addons/events/mongodb/deployment/pom.xml @@ -64,6 +64,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/predictions/deployment/pom.xml b/quarkus/addons/events/predictions/deployment/pom.xml index 403b958d167..d485b12fa61 100644 --- a/quarkus/addons/events/predictions/deployment/pom.xml +++ b/quarkus/addons/events/predictions/deployment/pom.xml @@ -64,6 +64,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml index 50ef92684c1..b852f1149fa 100644 --- a/quarkus/addons/events/process/runtime/pom.xml +++ b/quarkus/addons/events/process/runtime/pom.xml @@ -134,6 +134,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml index 5a36104b6b2..f4d2cc1b614 100644 --- a/quarkus/addons/explainability/runtime/pom.xml +++ b/quarkus/addons/explainability/runtime/pom.xml @@ -116,6 +116,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml index 4535fa8c29b..7f847f9cde6 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml @@ -63,6 +63,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml index 0f8b22f9f69..e37281d150c 100644 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml @@ -129,6 +129,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/flyway/deployment/pom.xml b/quarkus/addons/flyway/deployment/pom.xml index 1e6eefccdc8..825096b9f9b 100644 --- a/quarkus/addons/flyway/deployment/pom.xml +++ b/quarkus/addons/flyway/deployment/pom.xml @@ -74,6 +74,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/flyway/runtime/pom.xml b/quarkus/addons/flyway/runtime/pom.xml index 3190d2cbf8b..0d56fede89e 100644 --- a/quarkus/addons/flyway/runtime/pom.xml +++ b/quarkus/addons/flyway/runtime/pom.xml @@ -86,6 +86,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java b/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java index 7aaa4c8e4a5..92d5ef31d63 100644 --- a/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java +++ b/quarkus/addons/jobs/knative-eventing/deployment/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/deployment/KogitoAddOnJobsKnativeEventingProcessorTest.java @@ -161,7 +161,7 @@ void buildCloudEventsMetadataWithoutEvents() { KogitoAddOnJobsKnativeEventingProcessor processor = new KogitoAddOnJobsKnativeEventingProcessor(); processor.buildCloudEventsMetadata(singletonList(kogitoProcessContainerGeneratorBuildItem), buildItemProducer); - verify(buildItemProducer, never()).produce(any()); + verify(buildItemProducer, never()).produce(any(KogitoCloudEventsBuildItem.class)); } @Test diff --git a/quarkus/addons/jobs/messaging/deployment/pom.xml b/quarkus/addons/jobs/messaging/deployment/pom.xml index 85f34759918..f648834dd98 100644 --- a/quarkus/addons/jobs/messaging/deployment/pom.xml +++ b/quarkus/addons/jobs/messaging/deployment/pom.xml @@ -83,6 +83,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/eventing/deployment/pom.xml b/quarkus/addons/knative/eventing/deployment/pom.xml index c21404d0034..8ae90866aab 100644 --- a/quarkus/addons/knative/eventing/deployment/pom.xml +++ b/quarkus/addons/knative/eventing/deployment/pom.xml @@ -111,6 +111,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java index 9d9a8a2267c..b194995fd59 100644 --- a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java +++ b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessorTest.java @@ -179,7 +179,7 @@ void checkProcessEventsWithoutEventPublisher() { KogitoAddOnKnativeEventingProcessor eventingProcessor = new KogitoAddOnKnativeEventingProcessor(); eventingProcessor.checkProcessEvents(buildProducer, combinedIndex); - verify(buildProducer, never()).produce(any()); + verify(buildProducer, never()).produce(any(SystemPropertyBuildItem.class)); } @Test diff --git a/quarkus/addons/knative/eventing/integration-tests/pom.xml b/quarkus/addons/knative/eventing/integration-tests/pom.xml index 6852603d081..332d144d109 100644 --- a/quarkus/addons/knative/eventing/integration-tests/pom.xml +++ b/quarkus/addons/knative/eventing/integration-tests/pom.xml @@ -57,6 +57,10 @@ org.kie kie-addons-quarkus-knative-eventing + + io.quarkus + quarkus-resteasy-client-oidc-filter + io.quarkus quarkus-resteasy diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml index 92bc7ce7187..1e8233ccd69 100644 --- a/quarkus/addons/knative/eventing/runtime/pom.xml +++ b/quarkus/addons/knative/eventing/runtime/pom.xml @@ -110,6 +110,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/serving/deployment/pom.xml b/quarkus/addons/knative/serving/deployment/pom.xml index 70b4e7f8c03..206dd0bf6cd 100644 --- a/quarkus/addons/knative/serving/deployment/pom.xml +++ b/quarkus/addons/knative/serving/deployment/pom.xml @@ -88,6 +88,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml index 86e00cd1a2b..fc784c365a1 100644 --- a/quarkus/addons/knative/serving/runtime/pom.xml +++ b/quarkus/addons/knative/serving/runtime/pom.xml @@ -147,6 +147,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml index 4fc149b6251..b91aa456775 100644 --- a/quarkus/addons/persistence/infinispan/runtime/pom.xml +++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml @@ -93,6 +93,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml index a2f11150fb3..2e89894d97d 100644 --- a/quarkus/addons/persistence/postgresql/runtime/pom.xml +++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml @@ -107,6 +107,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml index 1056cf7965d..4c15802769a 100644 --- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml +++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml @@ -92,6 +92,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/addons/process-management/integration-tests/pom.xml b/quarkus/addons/process-management/integration-tests/pom.xml index 6bbfa96c5fa..43a2493f594 100644 --- a/quarkus/addons/process-management/integration-tests/pom.xml +++ b/quarkus/addons/process-management/integration-tests/pom.xml @@ -58,6 +58,10 @@ org.kie kie-addons-quarkus-process-management + + io.quarkus + quarkus-oidc-client-filter + io.quarkus quarkus-resteasy diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml index 48161a444b1..dea3c6b06c7 100644 --- a/quarkus/addons/process-management/runtime/pom.xml +++ b/quarkus/addons/process-management/runtime/pom.xml @@ -123,6 +123,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml index 0e417293745..54e736f2ffb 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/pom.xml @@ -85,7 +85,7 @@ io.quarkus - quarkus-resteasy-reactive-spi-deployment + quarkus-rest-server-spi-deployment io.quarkus diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml index 60d9efda1fc..fdcb5777629 100644 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml @@ -113,6 +113,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml index 3336f6660c2..31a223d4707 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-deployment/pom.xml @@ -89,6 +89,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml index ec86ffab09f..bd519244976 100644 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml @@ -98,6 +98,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml index 5caf3a85a6e..ceac3864a24 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml @@ -84,11 +84,19 @@ io.quarkus - quarkus-rest-client-deployment + quarkus-resteasy-client-deployment io.quarkus - quarkus-rest-client-jackson-deployment + quarkus-resteasy-client-jackson-deployment + + + io.quarkus + quarkus-resteasy-common-deployment + + + io.quarkus + quarkus-apache-httpclient-deployment io.quarkus @@ -124,6 +132,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml index 8da03ff0f7b..c1870332aec 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml @@ -57,12 +57,12 @@ io.quarkus - quarkus-rest-client + quarkus-resteasy-client io.quarkus - quarkus-rest-client-jackson + quarkus-resteasy-client-jackson @@ -82,7 +82,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkiverse.reactivemessaging.http @@ -182,6 +182,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml index cf9e3b9ea6d..ddb5c70ca81 100644 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/pom.xml @@ -95,6 +95,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true +