Updated JPMML-Evaluator dependency

jpmml · Jan 1, 2025 · 5b63898 · 5b63898
1 parent ff4172b
commit 5b63898
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 21 deletions.
diff --git a/inst/java/classpath.txt b/inst/java/classpath.txt
@@ -6,8 +6,8 @@ jakarta.activation-2.0.1.jar
 jakarta.xml.bind-api-3.0.1.jar
 jaxb-core-3.0.2.jar
 jaxb-runtime-3.0.2.jar
-pmml-evaluator-1.6.8.jar
-pmml-evaluator-metro-1.6.8.jar
-pmml-model-1.6.8.jar
-pmml-model-metro-1.6.8.jar
+pmml-evaluator-1.6.9.jar
+pmml-evaluator-metro-1.6.9.jar
+pmml-model-1.6.9.jar
+pmml-model-metro-1.6.9.jar
 pmml-rexp-1.6.4-minified.jar
diff --git a/inst/java/jpmml-evaluator-r-1.0-SNAPSHOT.jar b/inst/java/jpmml-evaluator-r-1.0-SNAPSHOT.jar
diff --git a/inst/java/pmml-evaluator-1.6.8.jar → inst/java/pmml-evaluator-1.6.9.jar b/inst/java/pmml-evaluator-1.6.8.jar → inst/java/pmml-evaluator-1.6.9.jar
diff --git a/inst/java/pmml-evaluator-metro-1.6.8.jar b/inst/java/pmml-evaluator-metro-1.6.8.jar
diff --git a/inst/java/pmml-evaluator-metro-1.6.9.jar b/inst/java/pmml-evaluator-metro-1.6.9.jar
diff --git a/inst/java/pmml-model-1.6.8.jar b/inst/java/pmml-model-1.6.8.jar
diff --git a/inst/java/pmml-model-1.6.9.jar b/inst/java/pmml-model-1.6.9.jar
diff --git a/inst/java/pmml-model-metro-1.6.8.jar → inst/java/pmml-model-metro-1.6.9.jar b/inst/java/pmml-model-metro-1.6.8.jar → inst/java/pmml-model-metro-1.6.9.jar
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jpmml</groupId>
 		<artifactId>jpmml-evaluator</artifactId>
-		<version>1.6.8</version>
+		<version>1.6.9</version>
 	</parent>
 
 	<groupId>org.jpmml</groupId>

diff --git a/src/main/java/org/jpmml/evaluator/rexp/RExpUtil.java b/src/main/java/org/jpmml/evaluator/rexp/RExpUtil.java
@@ -199,10 +199,11 @@ private RGenericVector formatDataFrame(Table table, boolean stringsAsFactors){
 			vectors.add(vector);
 		}
 
-		List<Exception> exceptions = table.getExceptions();
 		List<String> errors = null;
 
-		if(containsNonNull(exceptions)){
+		if(table.hasExceptions()){
+			List<Exception> exceptions = table.getExceptions();
+
 			errors = exceptions.stream()
 				.map(exception -> (exception != null ? exception.toString() : null))
 				.collect(Collectors.toList());
@@ -275,20 +276,6 @@ private RVector<?> createVector(List<?> values){
 		}
 	}
 
-	static
-	private <E> boolean containsNonNull(List<E> values){
-
-		for(int i = 0; i < values.size(); i++){
-			E value = values.get(i);
-
-			if(value != null){
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	static
 	private RExp unserialize(byte[] bytes) throws IOException {