From 7bfed140c72156d0976afe4978fb82c6519276de Mon Sep 17 00:00:00 2001
From: Villu Ruusmann <villu.ruusmann@gmail.com>
Date: Sun, 7 Jul 2024 13:36:26 +0300
Subject: [PATCH] Fixed FieldValue#toString() method for non-scalars

---
 .../src/main/java/org/jpmml/evaluator/FieldValue.java    | 1 -
 .../src/main/java/org/jpmml/evaluator/ScalarValue.java   | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pmml-evaluator/src/main/java/org/jpmml/evaluator/FieldValue.java b/pmml-evaluator/src/main/java/org/jpmml/evaluator/FieldValue.java
index 33f9d3b8..3981fff2 100644
--- a/pmml-evaluator/src/main/java/org/jpmml/evaluator/FieldValue.java
+++ b/pmml-evaluator/src/main/java/org/jpmml/evaluator/FieldValue.java
@@ -325,7 +325,6 @@ protected ToStringHelper toStringHelper(){
 		ToStringHelper helper = new ToStringHelper(this)
 			.add("opType", getOpType())
 			.add("dataType", getDataType())
-			.add("valid", isValid())
 			.add("value", getValue());
 
 		return helper;
diff --git a/pmml-evaluator/src/main/java/org/jpmml/evaluator/ScalarValue.java b/pmml-evaluator/src/main/java/org/jpmml/evaluator/ScalarValue.java
index ed5bb53e..d2640f39 100644
--- a/pmml-evaluator/src/main/java/org/jpmml/evaluator/ScalarValue.java
+++ b/pmml-evaluator/src/main/java/org/jpmml/evaluator/ScalarValue.java
@@ -19,6 +19,7 @@
 package org.jpmml.evaluator;
 
 import org.dmg.pmml.DataType;
+import org.jpmml.model.ToStringHelper;
 
 abstract
 public class ScalarValue extends FieldValue implements Comparable<ScalarValue> {
@@ -87,6 +88,14 @@ public int compareTo(ScalarValue that){
 		return compareToValue(that);
 	}
 
+	@Override
+	protected ToStringHelper toStringHelper(){
+		ToStringHelper helper = super.toStringHelper()
+			.add("valid", isValid());
+
+		return helper;
+	}
+
 	static
 	private Object filterValue(Object value){