Fixed ValueNode.addPropertyValue to handle the case where the added

value is already a (jena) Node in particular a lang-tagged literal.
epimorphics · Nov 25, 2020 · 33d0217 · 33d0217
1 parent 439c531
commit 33d0217
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/com/epimorphics/dclib/values/ValueNode.java b/src/main/java/com/epimorphics/dclib/values/ValueNode.java
@@ -254,19 +254,28 @@ public ValueNode addPropertyValue(String p, Value o) {
     	return addPropertyValue(new ValueString(p), o) ;
     }
 
+    public ValueNode addPropertyValue(String p, Node o) {
+    	return addPropertyValue(new ValueString(p), o) ;
+    }
+
     public ValueNode addPropertyValue(Value p, Value o) {
+    	return addPropertyValue(p, o.asNode());
+    }
+
+    public ValueNode addPropertyValue(Value p, Node o) {
         ConverterProcess proc = ConverterProcess.get();
         DataContext      dc   = proc.getDataContext();
         StreamRDF        out = proc.getOutputStream();
 
         Resource prop = ResourceFactory.createResource(dc.expandURI(p.toString()) );
 
-        out.triple(new Triple(this.asNode(), prop.asNode(), o.asNode()));
+        out.triple(new Triple(this.asNode(), prop.asNode(), o));
 //        model.getModel().add(this.asResource(), prop, (RDFNode) val);
 
     	return this;
     }
 
+
     public ValueNode addObjectPropertyValue(String p, String o) {
     	return addObjectPropertyValue(new ValueString(p),  new ValueString(o)) ;
     }

diff --git a/src/test/java/com/epimorphics/dclib/values/TestValueNode.java b/src/test/java/com/epimorphics/dclib/values/TestValueNode.java
@@ -67,6 +67,7 @@ public void testAddProperty() {
 				+ ".addPropertyValue(       'dct:hasVersion',                     value('10.5').asDecimal())"                          	 // String, ValueNumber
 				+ ".addObjectPropertyValue( 'dct:isVersionOf',                   'http://example.com/bar')"                   		     // String, String
 				+ ".addObjectPropertyValue( value('dct:isVersionOf').asRDFNode(), value('http://example.com/bar2'))"                     // ValueNode, ValueNode
+				+ ".addPropertyValue(        'rdfs:label',                        value('This is also a test').lang('en'))"              // String, Node 
 				+ ".asResource()"
 				+ "}"
 			    );
@@ -75,7 +76,9 @@ public void testAddProperty() {
 		assertTrue("Missing or unexpected dct:created value",                proc.getModel().contains(r, DCTerms.created,proc.getModel().createTypedLiteral("2018-05-29T12:24:00Z",XSDDatatype.XSDdateTime)));
 		assertTrue("Missing or unexpected dct:hasVersion (decimal) value",   proc.getModel().contains(r, DCTerms.hasVersion,proc.getModel().createTypedLiteral(BigDecimal.valueOf(10.5))));
 		assertTrue("Missing or unexpected dct:isVersionOf (resource) value", proc.getModel().contains(r, DCTerms.isVersionOf, proc.getModel().getResource("http://example.com/bar")));
-		assertTrue("Missing or unexpected dct:isVersionOf (resource) value", proc.getModel().contains(r, DCTerms.isVersionOf, proc.getModel().getResource("http://example.com/bar2")));		
+		assertTrue("Missing or unexpected dct:isVersionOf (resource) value", proc.getModel().contains(r, DCTerms.isVersionOf, proc.getModel().getResource("http://example.com/bar2")));
+		assertTrue("Missing or unexpected rdfs:label value",                 proc.getModel().contains(r, RDFS.label, proc.getModel().createLiteral("This is also a test","en")));
+
 	}
 
 	private Object eval(String pattern) {