Repository: jena Updated Branches: refs/heads/master 106aae5af -> b8540b431
JENA-1154: Output up-to-date JSON results format Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b8540b43 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b8540b43 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b8540b43 Branch: refs/heads/master Commit: b8540b431e7def6a621ca37aa9ddba85b0cb21db Parents: 106aae5 Author: Andy Seaborne <[email protected]> Authored: Tue Mar 8 19:12:53 2016 +0000 Committer: Andy Seaborne <[email protected]> Committed: Tue Mar 8 19:12:53 2016 +0000 ---------------------------------------------------------------------- .../org/apache/jena/sparql/resultset/JSONOutputResultSet.java | 4 ++-- .../java/org/apache/jena/sparql/resultset/JSONResultsKW.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b8540b43/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONOutputResultSet.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONOutputResultSet.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONOutputResultSet.java index 1d0377a..ff86222 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONOutputResultSet.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONOutputResultSet.java @@ -195,11 +195,11 @@ public class JSONOutputResultSet implements ResultSetProcessor { out.println(); } } else { - out.print(quoteName(kDatatype) + ": " + quote(datatype) + " , "); + out.print(quoteName(kType) + ": " + quote(kLiteral) + " , "); if ( multiLineValues ) out.println(); - out.print(quoteName(kType) + ": " + quote(kTypedLiteral) + " , "); + out.print(quoteName(kDatatype) + ": " + quote(datatype) + " , "); if ( multiLineValues ) out.println(); } http://git-wip-us.apache.org/repos/asf/jena/blob/b8540b43/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONResultsKW.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONResultsKW.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONResultsKW.java index c90d2cb..897ca6d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONResultsKW.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONResultsKW.java @@ -33,6 +33,7 @@ public class JSONResultsKW public static String kUri = "uri" ; public static String kValue = "value" ; public static String kLiteral = "literal" ; + // Legacy. public static String kTypedLiteral = "typed-literal" ; public static String kXmlLang = "xml:lang" ; public static String kDatatype = "datatype" ;
