Update for quarkus-3 environment

kiegroup · Sep 4, 2023 · d5cb862 · d5cb862
1 parent 5fdfd79
commit d5cb862
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/kie-dmn-jpmml/pom.xml b/kie-dmn-jpmml/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>org.kie</groupId>
  <artifactId>kie-jpmml-integration</artifactId>
- <version>8.44.0-SNAPSHOT</version>
+ <version>9.44.0-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <artifactId>kie-dmn-jpmml</artifactId>
@@ -46,12 +46,6 @@
  <scope>provided</scope>
  <optional>true</optional>
  </dependency>
- <dependency>
- <groupId>org.jpmml</groupId>
- <artifactId>pmml-evaluator-extension</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
  <!-- /External dependencies -->
 
  <dependency>

diff --git a/kie-dmn-jpmml/src/main/java/org/kie/dmn/jpmml/DMNjPMMLInvocationEvaluator.java b/kie-dmn-jpmml/src/main/java/org/kie/dmn/jpmml/DMNjPMMLInvocationEvaluator.java
@@ -24,8 +24,7 @@
 import java.util.Map.Entry;
 import java.util.function.Supplier;
 
-import org.dmg.pmml.FieldName;
-import org.jpmml.evaluator.visitors.DefaultModelEvaluatorBattery;
+import org.jpmml.evaluator.visitors.ModelEvaluatorVisitorBattery;
 import org.jpmml.evaluator.EvaluatorUtil;
 import org.jpmml.evaluator.FieldValue;
 import org.jpmml.evaluator.InputField;
@@ -53,7 +52,7 @@ public DMNjPMMLInvocationEvaluator(String dmnNS, DMNElement node, Resource pmmlR
  super(dmnNS, node, pmmlResource, model);
  LoadingModelEvaluatorBuilder builder = new LoadingModelEvaluatorBuilder();
  try (InputStream documentStream = documentResource.getInputStream()) {
- Supplier<DefaultModelEvaluatorBattery> visitors = () -> new DefaultModelEvaluatorBattery();
+ Supplier<ModelEvaluatorVisitorBattery> visitors = ModelEvaluatorVisitorBattery::new;
  evaluator = builder.setLocatable(false)
  .setVisitors(visitors.get())
  .load(documentStream)
@@ -66,16 +65,16 @@ public DMNjPMMLInvocationEvaluator(String dmnNS, DMNElement node, Resource pmmlR
  public EvaluatorResult evaluate(DMNRuntimeEventManager eventManager, DMNResult dmnr) {
  List<? extends InputField> inputFields = evaluator.getInputFields();
 
- Map<FieldName, FieldValue> arguments = new LinkedHashMap<>();
+ Map<String, FieldValue> arguments = new LinkedHashMap<>();
  for (InputField inputField : inputFields) {
- FieldName inputName = inputField.getName();
- Object rawValue = getValueForPMMLInput(dmnr, inputName.getValue());
+ String inputName = inputField.getName();
+ Object rawValue = getValueForPMMLInput(dmnr, inputName);
  FieldValue inputValue = inputField.prepare(rawValue);
  LOG.trace("{}", inputName);
  LOG.trace("{}", inputValue);
  arguments.put(inputName, inputValue);
  }
- Map<FieldName, ?> results = evaluator.evaluate(arguments);
+ Map<String, ?> results = evaluator.evaluate(arguments);
  Map<String, ?> resultsRecord = EvaluatorUtil.decodeAll(results);
 
  Map<String, Object> result = new HashMap<>();
@@ -85,7 +84,7 @@ public EvaluatorResult evaluate(DMNRuntimeEventManager eventManager, DMNResult d
  }
  } else {
  for (OutputField of : evaluator.getOutputFields()) {
- String outputFieldName = of.getName().getValue();
+ String outputFieldName = of.getName();
  result.put(outputFieldName, EvalHelper.coerceNumber(resultsRecord.getOrDefault(outputFieldName, null)));
  }
  }

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.kie</groupId>
  <artifactId>drools-build-parent</artifactId>
- <version>8.44.0-SNAPSHOT</version>
+ <version>9.44.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>kie-jpmml-integration</artifactId>
@@ -48,7 +48,7 @@
  </modules>
 
  <properties>
- <version.org.jpmml.evaluator>1.5.1</version.org.jpmml.evaluator> <!-- ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
+ <version.org.jpmml.evaluator>1.6.4</version.org.jpmml.evaluator> <!-- ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
  </properties>
 
  <dependencyManagement>
@@ -58,11 +58,7 @@
  <artifactId>pmml-evaluator</artifactId>
  <version>${version.org.jpmml.evaluator}</version>
  </dependency>
- <dependency>
- <groupId>org.jpmml</groupId>
- <artifactId>pmml-evaluator-extension</artifactId>
- <version>${version.org.jpmml.evaluator}</version>
- </dependency>
+
  </dependencies>
  </dependencyManagement>
 </project>