You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/12/09 17:17:44 UTC
svn commit: r1549601 - in
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot:
lang/PrintingStreamRDF.java system/LoggingStreamRDF.java
system/PrintingStreamRDF.java system/StreamRDF2.java
writer/WriterStreamRDFTuples.java
Author: andy
Date: Mon Dec 9 16:17:43 2013
New Revision: 1549601
URL: http://svn.apache.org/r1549601
Log:
Utilities for debugging/output.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
- copied, changed from r1548091, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PrintingStreamRDF.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PrintingStreamRDF.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java?rev=1549601&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LoggingStreamRDF.java Mon Dec 9 16:17:43 2013
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+import org.apache.jena.atlas.lib.Tuple ;
+import org.apache.jena.riot.out.NodeFmtLib ;
+import org.slf4j.Logger ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+
+public class LoggingStreamRDF implements StreamRDF
+{
+ private Logger log ;
+
+ public LoggingStreamRDF(Logger log) { this.log = log ; }
+
+ @Override
+ public void start()
+ {}
+
+ @Override
+ public void triple(Triple triple)
+ {
+ String string = NodeFmtLib.str(triple) ;
+ log.info(string) ;
+ }
+
+ @Override
+ public void quad(Quad quad)
+ {
+ String string = NodeFmtLib.str(quad) ;
+ log.info(string) ;
+ }
+
+ @Override
+ public void tuple(Tuple<Node> tuple)
+ {}
+
+ @Override
+ public void base(String base)
+ {
+ log.info("BASE -- "+base) ;
+ }
+
+ @Override
+ public void prefix(String prefix, String iri)
+ {
+ log.info("Prefix ("+prefix+","+iri+")") ;
+ }
+
+ @Override
+ public void finish()
+ {}
+
+}
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java (from r1548091, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PrintingStreamRDF.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PrintingStreamRDF.java&r1=1548091&r2=1549601&rev=1549601&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PrintingStreamRDF.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java Mon Dec 9 16:17:43 2013
@@ -16,59 +16,41 @@
* limitations under the License.
*/
-package org.apache.jena.riot.lang;
+package org.apache.jena.riot.system;
-import org.apache.jena.atlas.lib.Tuple ;
-import org.apache.jena.riot.out.NodeFmtLib ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.slf4j.Logger ;
-
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.sparql.core.Quad ;
+import java.io.OutputStream ;
-public class PrintingStreamRDF implements StreamRDF
-{
- private Logger log ;
-
- public PrintingStreamRDF(Logger log) { this.log = log ; }
-
- @Override
- public void start()
- {}
+import org.apache.jena.atlas.io.AWriter ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
- @Override
- public void triple(Triple triple)
- {
- String string = NodeFmtLib.str(triple) ;
- log.info(string) ;
+/** Primarily for debugging */
+public class PrintingStreamRDF extends WriterStreamRDFTuples //implements StreamRDF
+{
+ public PrintingStreamRDF(OutputStream out) {
+ super(init(out)) ;
}
- @Override
- public void quad(Quad quad)
- {
- String string = NodeFmtLib.str(quad) ;
- log.info(string) ;
+ private static AWriter init(OutputStream out) {
+ return IO.wrapUTF8(out) ;
}
@Override
- public void tuple(Tuple<Node> tuple)
- {}
-
- @Override
- public void base(String base)
- {
- log.info("BASE -- "+base) ;
+ public void base(String base) {
+ out.print("BASE") ;
+ out.print(" ") ;
+ nodeFmt.formatURI(out, base);
+ out.println();
}
@Override
- public void prefix(String prefix, String iri)
- {
- log.info("Prefix ("+prefix+","+iri+")") ;
+ public void prefix(String prefix, String iri) {
+ out.print("PREFIX") ;
+ out.print(" ") ;
+ out.print(prefix) ;
+ out.print(": ") ;
+ nodeFmt.formatURI(out, iri);
+ out.println();
}
- @Override
- public void finish()
- {}
-
}
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java?rev=1549601&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java Mon Dec 9 16:17:43 2013
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+import org.apache.jena.atlas.lib.Tuple ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+
+/** Send to two stream */
+public class StreamRDF2 implements StreamRDF
+{
+ protected final StreamRDF sink1 ;
+ protected final StreamRDF sink2 ;
+
+ public StreamRDF2(StreamRDF sink1, StreamRDF sink2) {
+ this.sink1 = sink1 ;
+ this.sink2 = sink2 ;
+ }
+
+ @Override
+ public void start() {
+ sink1.start() ;
+ sink2.start() ;
+ }
+
+ @Override
+ public void triple(Triple triple) {
+ sink1.triple(triple) ;
+ sink2.triple(triple) ;
+ }
+
+ @Override
+ public void quad(Quad quad) {
+ sink1.quad(quad) ;
+ sink2.quad(quad) ;
+ }
+
+ @Override
+ public void tuple(Tuple<Node> tuple) {
+ sink1.tuple(tuple) ;
+ sink2.tuple(tuple) ;
+ }
+
+ @Override
+ public void base(String base) {
+ sink1.base(base) ;
+ sink2.base(base) ;
+ }
+
+ @Override
+ public void prefix(String prefix, String iri) {
+ sink1.prefix(prefix, iri) ;
+ sink2.prefix(prefix, iri) ;
+ }
+
+ @Override
+ public void finish() {
+ sink1.finish() ;
+ sink2.finish() ; ;
+ }
+
+}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java?rev=1549601&r1=1549600&r2=1549601&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFTuples.java Mon Dec 9 16:17:43 2013
@@ -40,9 +40,8 @@ public class WriterStreamRDFTuples imple
// This class is the overall structure - the NodeFormatter controls the
// appearance of the Nodes themselves.
- private final AWriter out ;
-
- private final NodeFormatter nodeFmt ;
+ protected final AWriter out ;
+ protected final NodeFormatter nodeFmt ;
/** Output tuples, using UTF8 output
* See {@linkplain StreamRDFLib#writer} for ways to create a AWriter object.