rollback FmtTemplate, in order to build success for TS_Scripted Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/07c8b98d Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/07c8b98d Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/07c8b98d
Branch: refs/heads/JENA-491-construct-quads Commit: 07c8b98dbafbf2ea12ee3f6df6816e8edda93650 Parents: 2d09a7d Author: confidencesun <[email protected]> Authored: Fri Jun 12 11:03:13 2015 +0800 Committer: confidencesun <[email protected]> Committed: Fri Jun 12 11:03:13 2015 +0800 ---------------------------------------------------------------------- .../apache/jena/sparql/lang/ParserSPARQL11.java | 2 +- .../jena/sparql/serializer/FmtTemplate.java | 2 +- .../jena/sparql/serializer/FormatterBase.java | 20 ++----- .../org/apache/jena/sparql/syntax/Template.java | 9 +++ .../org/apache/jena/sparql/util/FmtUtils.java | 63 +++++++------------- 5 files changed, 39 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/07c8b98d/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java index 4182b21..a459d32 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11.java @@ -97,7 +97,7 @@ public class ParserSPARQL11 extends SPARQLParser action.exec(parser) ; } catch (org.apache.jena.sparql.lang.sparql_11.ParseException ex) - { + { throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn http://git-wip-us.apache.org/repos/asf/jena/blob/07c8b98d/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FmtTemplate.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FmtTemplate.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FmtTemplate.java index 1b08876..a1b65fd 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FmtTemplate.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FmtTemplate.java @@ -55,7 +55,7 @@ public class FmtTemplate extends FormatterBase out.incIndent(INDENT) ; out.pad() ; - formatQuads(template.getQuads()) ; + formatTriples(template.getBGP()) ; out.decIndent(INDENT) ; out.print("}") ; http://git-wip-us.apache.org/repos/asf/jena/blob/07c8b98d/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java index 3eb26fc..fddb3a2 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java @@ -17,14 +17,11 @@ */ package org.apache.jena.sparql.serializer; -import java.util.List; - -import org.apache.jena.atlas.io.IndentedWriter; -import org.apache.jena.graph.Node; -import org.apache.jena.graph.Triple; -import org.apache.jena.sparql.core.BasicPattern; -import org.apache.jena.sparql.core.Quad; -import org.apache.jena.sparql.util.FmtUtils; +import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.graph.Node ; +import org.apache.jena.graph.Triple ; +import org.apache.jena.sparql.core.BasicPattern ; +import org.apache.jena.sparql.util.FmtUtils ; public abstract class FormatterBase { @@ -46,11 +43,6 @@ public abstract class FormatterBase FmtUtils.formatPattern(out, pattern, context) ; } - protected void formatQuads(List<Quad> quads) - { - FmtUtils.formatQuads(out, quads, context) ; - } - protected void formatTriple(Triple tp) { out.print(slotToString(tp.getSubject())) ; @@ -59,7 +51,7 @@ public abstract class FormatterBase out.print(" ") ; out.print(slotToString(tp.getObject())) ; } - + protected String slotToString(Node n) { return FmtUtils.stringForNode(n, context) ; http://git-wip-us.apache.org/repos/asf/jena/blob/07c8b98d/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java index bdd3142..24f6c66 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.jena.graph.Node; import org.apache.jena.graph.Triple; +import org.apache.jena.sparql.core.BasicPattern; import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.engine.binding.Binding; import org.apache.jena.sparql.modify.TemplateLib; @@ -56,6 +57,14 @@ public class Template // public BasicPattern getBGP() { return bgp ; } + public BasicPattern getBGP() + { + BasicPattern bgp = new BasicPattern(); + for(Quad q: qp.getQuads()){ + bgp.add(q.asTriple()); + } + return bgp; + } public List<Triple> getTriples() { List<Triple> triples = new ArrayList<Triple>(); http://git-wip-us.apache.org/repos/asf/jena/blob/07c8b98d/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java index 6af1859..aa1500c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java @@ -18,29 +18,28 @@ package org.apache.jena.sparql.util; -import java.util.List; -import java.util.Locale; -import java.util.regex.Pattern; - -import org.apache.jena.atlas.io.IndentedWriter; -import org.apache.jena.atlas.logging.Log; -import org.apache.jena.graph.Node; -import org.apache.jena.graph.Node_Literal; -import org.apache.jena.graph.Triple; -import org.apache.jena.iri.IRI; -import org.apache.jena.iri.IRIFactory; -import org.apache.jena.iri.IRIRelativize; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.RDFNode; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.sparql.ARQConstants; -import org.apache.jena.sparql.ARQInternalErrorException; -import org.apache.jena.sparql.core.BasicPattern; -import org.apache.jena.sparql.core.Prologue; -import org.apache.jena.sparql.core.Quad; -import org.apache.jena.sparql.serializer.SerializationContext; -import org.apache.jena.vocabulary.XSD; +import java.util.Locale ; +import java.util.regex.Pattern ; + +import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.logging.Log ; +import org.apache.jena.graph.Node ; +import org.apache.jena.graph.Node_Literal ; +import org.apache.jena.graph.Triple ; +import org.apache.jena.iri.IRI ; +import org.apache.jena.iri.IRIFactory ; +import org.apache.jena.iri.IRIRelativize ; +import org.apache.jena.rdf.model.Model ; +import org.apache.jena.rdf.model.RDFNode ; +import org.apache.jena.rdf.model.Resource ; +import org.apache.jena.shared.PrefixMapping ; +import org.apache.jena.sparql.ARQConstants ; +import org.apache.jena.sparql.ARQInternalErrorException ; +import org.apache.jena.sparql.core.BasicPattern ; +import org.apache.jena.sparql.core.Prologue ; +import org.apache.jena.sparql.core.Quad ; +import org.apache.jena.sparql.serializer.SerializationContext ; +import org.apache.jena.vocabulary.XSD ; /** Presentation forms of various kinds of objects. * Beware that bNodes are abbreviated to _:b0 etc. @@ -160,24 +159,6 @@ public class FmtUtils } } - public static void formatQuads(IndentedWriter out, List<Quad> quads, SerializationContext sCxt) - { - StringBuilder buffer = new StringBuilder() ; - boolean first = true ; - for (Quad quad : quads ) - { - if ( ! first ) - buffer.append("\n") ; - stringForQuad(buffer, quad, sCxt) ; - buffer.append(" ." ) ; - out.print(buffer.toString()) ; - buffer.setLength(0) ; - first = false ; - } - } - - - public static String stringForObject(Object obj) { if ( obj == null )
