Merge branch 'master' of github.com:eclipse/rdf4j into develop

Author: James Leigh

core/queryparser/sparql/src/main/java/org/eclipse/rdf4j/query/parser/sparql/TupleExprBuilder.java

@@ -21,7 +21,6 @@
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.ValueFactory;
-import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil;
 import org.eclipse.rdf4j.model.impl.BooleanLiteral;
 import org.eclipse.rdf4j.model.vocabulary.FN;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
@@ -2766,8 +2765,7 @@ public ValueConstant visit(ASTRDFLiteral node, Object data)
 				// invalid URI
 				throw new VisitorException(e.getMessage());
 			}
-			String normalized = XMLDatatypeUtil.normalize(label, datatype);
-			literal = valueFactory.createLiteral(normalized, datatype);
+			literal = valueFactory.createLiteral(label, datatype);
 		}
 		else if (lang != null) {
 			literal = valueFactory.createLiteral(label, lang);
@@ -2783,9 +2781,7 @@ else if (lang != null) {
 	public ValueConstant visit(ASTNumericLiteral node, Object data)
 		throws VisitorException
 	{
-		IRI datatype = node.getDatatype();
-		String label = XMLDatatypeUtil.normalize(node.getValue(), datatype);
-		Literal literal = valueFactory.createLiteral(label, datatype);
+		Literal literal = valueFactory.createLiteral(node.getValue(), node.getDatatype());
 		return new ValueConstant(literal);
 	}
 

core/queryparser/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/SPARQLParserTest.java

@@ -30,8 +30,6 @@
 import org.eclipse.rdf4j.query.algebra.StatementPattern;
 import org.eclipse.rdf4j.query.algebra.TupleExpr;
 import org.eclipse.rdf4j.query.algebra.UpdateExpr;
-import org.eclipse.rdf4j.query.algebra.ValueConstant;
-import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor;
 import org.eclipse.rdf4j.query.parser.ParsedBooleanQuery;
 import org.eclipse.rdf4j.query.parser.ParsedGraphQuery;
 import org.eclipse.rdf4j.query.parser.ParsedQuery;
@@ -312,23 +310,4 @@ public void testLongUnicode() throws Exception {
 		assertEquals("\uD83D\uDE1F", lines[lines.length -1].replaceAll(".*\"(.*)\".*", "$1"));
 	}
 
-	@Test
-	public void testAdditiveExpression()
-		throws Exception
-	{
-		String ask = "ASK { ?this <urn:test:score> ?score FILTER (!(?score+5 != 0)) }";
-
-		ParsedQuery q = parser.parseQuery(ask, null);
-		q.getTupleExpr().visit(new AbstractQueryModelVisitor<Exception>() {
-
-			public void meet(ValueConstant node)
-				throws Exception
-			{
-				String label = node.getValue().stringValue();
-				assertFalse(label, label.startsWith("+"));
-			}
-		});
-
-	}
-
 }

core/spin/src/test/resources/testcases/test16.ttl

@@ -21,7 +21,7 @@ ASK WHERE {
                         	sp:arg1 [
                         		a sp:add ;
                         		sp:arg1 _:score ;
-                        		sp:arg2 5
+                        		sp:arg2 +5 # workaround for SES-2234
                         	];
                         	sp:arg2 0
                           ];