You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2018/02/07 20:30:36 UTC
[09/10] jena git commit: JENA-1457 Fix graph contract test
transaction usage
JENA-1457 Fix graph contract test transaction usage
this closes #352
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8567e272
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8567e272
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8567e272
Branch: refs/heads/master
Commit: 8567e272d8d1bb33284ee2c4bdba056b69d76139
Parents: 567f405
Author: Claude Warren <cl...@apache.org>
Authored: Sun Feb 4 11:11:46 2018 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Wed Feb 7 20:09:34 2018 +0000
----------------------------------------------------------------------
.../apache/jena/sparql/resultset/JSONInput.java | 170 +------------------
1 file changed, 1 insertion(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8567e272/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInput.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInput.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInput.java
index 1b4d895..264ac6c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInput.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInput.java
@@ -20,16 +20,6 @@ package org.apache.jena.sparql.resultset;
import java.io.InputStream;
-import org.apache.jena.atlas.json.JSON;
-import org.apache.jena.atlas.json.JsonArray;
-import org.apache.jena.atlas.json.JsonObject;
-import org.apache.jena.atlas.json.JsonValue;
-import org.apache.jena.atlas.logging.Log;
-import org.apache.jena.datatypes.RDFDatatype;
-import org.apache.jena.datatypes.TypeMapper;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.query.ARQ;
import org.apache.jena.query.ResultSet;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.riot.resultset.ResultSetLang;
@@ -60,166 +50,8 @@ public class JSONInput extends SPARQLResult {
}
public static SPARQLResult make(InputStream input, Model model) {
- return new JSONInput().process(input, model);
+ return make(input);
}
private JSONInput() {}
-
- private Boolean booleanResult = null; // Valid if rows is null.
- private List<Binding> rows = null;
- private List<Var> vars = null;
-
- // TODO Streaming version of JSON Result set processing
-
- private SPARQLResult process(InputStream in, Model model) {
- parse(in);
- if ( model == null )
- model = GraphFactory.makeJenaDefaultModel();
- if ( rows != null ) {
- QueryIterator qIter = new QueryIterPlainWrapper(rows.iterator());
- ResultSet rs = new ResultSetStream(Var.varNames(vars), model, qIter);
- super.set(rs);
- } else
- super.set(booleanResult);
- return this;
- }
-
- private void parse(InputStream in) {
- JsonObject obj = JSON.parse(in);
-
- if ( obj.hasKey(kBoolean) ) {
- checkContains(obj, true, true, kHead, kBoolean);
- booleanResult = obj.get(kBoolean).getAsBoolean().value();
- rows = null;
- return;
- }
-
- rows = new ArrayList<>(1000);
-
- checkContains(obj, true, true, kHead, kResults);
-
- // process head
- if ( !obj.get(kHead).isObject() )
- throw new ResultSetException("Key 'head' must have a JSON object as value: found: " + obj.get(kHead));
- JsonObject head = obj.get(kHead).getAsObject();
-
- // ---- Head
- // -- Link - array.
- if ( head.hasKey(kLink) ) {
- List<String> links = new ArrayList<>();
-
- if ( head.get(kLink).isString() ) {
- Log.warn(this, "Link field is a string, should be an array of strings");
- links.add(head.get(kLink).getAsString().value());
- } else {
- if ( !head.get(kLink).isArray() )
- throw new ResultSetException("Key 'link' must have be an array: found: " + obj.get(kLink));
-
- for ( JsonValue v : head.get(kLink).getAsArray() ) {
- if ( !v.isString() )
- throw new ResultSetException("Key 'link' must have be an array of strings: found: " + v);
- links.add(v.getAsString().value());
- }
- }
- }
- // -- Vars
- vars = parseVars(head);
-
- // ---- Results
- JsonObject results = obj.get(kResults).getAsObject();
- if ( !results.get(kBindings).isArray() )
- throw new ResultSetException("'bindings' must be an array");
- JsonArray array = results.get(kBindings).getAsArray();
- Iterator<JsonValue> iter = array.iterator();
-
- for ( ; iter.hasNext() ; ) {
- BindingMap b = BindingFactory.create();
- JsonValue v = iter.next();
- if ( !v.isObject() )
- throw new ResultSetException("Entry in 'bindings' array must be an object {}");
- JsonObject x = v.getAsObject();
- Set<String> varNames = x.keys();
- for ( String vn : varNames ) {
- // if ( ! vars.contains(vn) ) {}
- JsonValue vt = x.get(vn);
- if ( !vt.isObject() )
- throw new ResultSetException("Binding for variable '" + vn + "' is not a JSON object: " + vt);
- Node n = parseOneTerm(vt.getAsObject());
- b.add(Var.alloc(vn), n);
- }
- rows.add(b);
- }
- }
-
- private List<Var> parseVars(JsonObject obj) {
- if ( !obj.get(kVars).isArray() )
- throw new ResultSetException("Key 'vars' must be a JSON array");
- JsonArray a = obj.get(kVars).getAsArray();
- Iterator<JsonValue> iter = a.iterator();
- List<Var> vars = new ArrayList<>();
- for ( ; iter.hasNext() ; ) {
- JsonValue v = iter.next();
- if ( !v.isString() )
- throw new ResultSetException("Entries in vars array must be strings");
- Var var = Var.alloc(v.getAsString().value());
- vars.add(var);
- }
- return vars;
- }
-
- private LabelToNode labelMap = ARQ.getContext().isTrue(ARQ.inputGraphBNodeLabels) ?
- SyntaxLabels.createLabelToNodeAsGiven() :
- SyntaxLabels.createLabelToNode();
-
- private Node parseOneTerm(JsonObject term) {
- checkContains(term, false, false, kType, kValue, kXmlLang, kDatatype);
-
- String type = stringOrNull(term, kType);
- String v = stringOrNull(term, kValue);
-
- if ( kUri.equals(type) ) {
- checkContains(term, false, true, kType, kValue);
- String uri = v;
- Node n = NodeFactory.createURI(v);
- return n;
- }
-
- if ( kLiteral.equals(type) || kTypedLiteral.equals(type) ) {
- String lang = stringOrNull(term, kXmlLang);
- String dtStr = stringOrNull(term, kDatatype);
- if ( lang != null && dtStr != null )
- throw new ResultSetException("Both language and datatype defined: " + term);
- RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtStr);
- return NodeFactory.createLiteral(v, lang, dt);
- }
-
- if ( kBnode.equals(type) )
- return labelMap.get(null, v);
-
- throw new ResultSetException("Object key not recognized as valid for an RDF term: " + term);
- }
-
- private static String stringOrNull(JsonObject obj, String key) {
- JsonValue v = obj.get(key);
- if ( v == null )
- return null;
- if ( !v.isString() )
- throw new ResultSetException("Not a string: key: " + key);
- return v.getAsString().value();
-
- }
-
- private static void checkContains(JsonObject term, boolean allowUndefinedKeys, boolean requireAllExpectedKeys, String... keys) {
- List<String> expectedKeys = Arrays.asList(keys);
- Set<String> declared = new HashSet<>();
- for ( String k : term.keys() ) {
- if ( !expectedKeys.contains(k) && !allowUndefinedKeys )
- throw new ResultSetException("Expected only object keys " + Arrays.asList(keys) + " but encountered '" + k + "'");
- if ( expectedKeys.contains(k) )
- declared.add(k);
- }
-
- if ( requireAllExpectedKeys && declared.size() < expectedKeys.size() )
- throw new ResultSetException("One or more of the required keys " + expectedKeys + " was not found");
- }
}