fix(TermFactory): term() method accepts an Object instead of a String…

… to avoid Polyglot API cast issues
SHACL-X · May 23, 2024 · a538416 · a538416
1 parent c8a30fb
commit a538416
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/org/topbraid/shacl/js/model/TermFactory.java b/src/main/java/org/topbraid/shacl/js/model/TermFactory.java
@@ -49,7 +49,8 @@ public JSBlankNode blankNode(String value) {
 
 
 	public JSLiteral literal(Object value, Object langOrDatatype) {
-        String stringVal = value.toString();
+		System.out.println("value: " + value.getClass() + " " + value);
+		String stringVal = value.toString();
         if (value instanceof Number) {
             stringVal = String.valueOf(value);
         }
@@ -76,13 +77,13 @@ public void registerNamespace(String prefix, String namespace) {
 	}
 
 
-	public JSTerm term(String str) {
-        Node n;
+	public JSTerm term(Object obj) {
+		Node n;
         try {
-        	n = NodeFactoryExtra.parseNode(str, pm);
+        	n = NodeFactoryExtra.parseNode(String.valueOf(obj), pm);
         }
         catch(Exception ex) {
-        	throw new IllegalArgumentException("Cannot parse node \"" + str + "\"", ex);
+        	throw new IllegalArgumentException("Cannot parse node \"" + obj + "\"", ex);
         }
         if(n.isURI()) {
         	return new JSNamedNode(n);

diff --git a/src/main/java/org/topbraid/shacl/py/model/PyTermFactory.java b/src/main/java/org/topbraid/shacl/py/model/PyTermFactory.java
@@ -68,12 +68,12 @@ public void registerNamespace(String prefix, String namespace) {
         pm.add(prefix, namespace);
     }
 
-    public PyTerm term(String str) {
+    public PyTerm term(Object obj) {
         Node n;
         try {
-            n = NodeFactoryExtra.parseNode(str, pm);
+            n = NodeFactoryExtra.parseNode(String.valueOf(obj), pm);
         } catch (Exception ex) {
-            throw new IllegalArgumentException("Cannot parse node \"" + str + "\"", ex);
+            throw new IllegalArgumentException("Cannot parse node \"" + obj + "\"", ex);
         }
         if (n.isURI()) {
             return new PyNamedNode(n);

diff --git a/src/test/resources/js/tests/rules/rectangle-rdfquery.js b/src/test/resources/js/tests/rules/rectangle-rdfquery.js
@@ -4,6 +4,6 @@ function computeArea($this) {
 	return $data.query().
 				match($this, "ex:width", "?width").
 				match($this, "ex:height", "?height").
-				bind("?area", function(sol) { return T(sol.width.lex * sol.height.lex) }).
+				bind("?area", function(sol) { return T(sol.width.getLex() * sol.height.getLex()) }).
 				construct($this, "ex:area", "?area");
 }