From bd20986670dd42663a15eeee8f9fde7b450b8b53 Mon Sep 17 00:00:00 2001
From: simonredfern <simon@tesobe.com>
Date: Wed, 3 Dec 2025 23:12:01 +0100
Subject: [PATCH] Accept true / false without quotes in Dynamic Entity field
 values. Allow tests to run

---
 obp-api/pom.xml                                    |  2 +-
 .../commons/model/enums/Enumerations.scala         | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/obp-api/pom.xml b/obp-api/pom.xml
index bd653e6a4..0a1501d84 100644
--- a/obp-api/pom.xml
+++ b/obp-api/pom.xml
@@ -568,7 +568,7 @@
             <forkMode>once</forkMode>
             <junitxml>.</junitxml>
             <filereports>WDF TestSuite.txt</filereports>
-            <argLine>-Drun.mode=test -XX:MaxMetaspaceSize=512m -Xms512m -Xmx512m</argLine>
+            <argLine>-Drun.mode=test -XX:MaxMetaspaceSize=512m -Xms512m -Xmx512m --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED</argLine>
             <tagsToExclude>code.external</tagsToExclude>
         </configuration>
         <executions>
diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala
index 30d4c17a3..3b4470a4a 100644
--- a/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala
+++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala
@@ -195,15 +195,17 @@ object DynamicEntityFieldType extends OBPEnumeration[DynamicEntityFieldType]{
   object number  extends Value{val jValueType = classOf[JDouble]}
   object integer extends Value{val jValueType = classOf[JInt]}
   object boolean extends Value {
-    val jValueType = classOf[JString]
+    val jValueType = classOf[JValue]
     override def isJValueValid(jValue: JValue): Boolean = {
-      super.isJValueValid(jValue) && {
-        val value = jValue.asInstanceOf[JString].s
-        val lowerValue = value.toLowerCase
-        lowerValue == "true" || lowerValue == "false"
+      jValue match {
+        case JBool(_) => true
+        case JString(s) => 
+          val lowerValue = s.toLowerCase
+          lowerValue == "true" || lowerValue == "false"
+        case _ => false
       }
     }
-    override def wrongTypeMsg: String = s"""the value's type should be string "true" or "false"."""
+    override def wrongTypeMsg: String = s"""the value's type should be boolean (true/false) or string ("true"/"false")."""
   }
   object string  extends Value{
     val jValueType = classOf[JString]