You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pr@jena.apache.org by GitBox <gi...@apache.org> on 2020/07/22 09:22:53 UTC
[GitHub] [jena] afs opened a new pull request #776: JENA-1937: SHACL Compact Syntax writer and jena-shacl clean-up.
afs opened a new pull request #776:
URL: https://github.com/apache/jena/pull/776
More (and hopefully final) work on the SHALC Compact Syntax writer together with cleanup of jena-shacls, including "shacl" command (in jena-cmds).
This PR adds a a RIOT writer for `Lang.SHACLC` -- this can only write what is expressible in SHACLC and does not write general RDF that is unconnected so as a writer it writes only part of a graph. It is therefore debatable general RDF APIS should work for SHACLC output. However, it does make working with SHACLC convenient.
If an attempt is made to write SHCAL that can't be expressed on compact syntax, the code throws an exception but, because it is a streaming writer, partial output occurs.
- Remove "verbose" validation flag. Whatever is the right way to do this, a specific API call for a specific validator implementation is not the way to do it.
- Reorganise the SHACLC tests.
- Rename "simple" validation as "plain". This is the implementation of the algorithm as given in the SHACL spec.
- Various small fixes to code after PR #775 based on using it.
- Refactoring and code tidying.
Also included:
- Changed checked exception `IOException` and make a runtime exception in various `IO.readWholeFile*` operations. This makes it more consistent and work with lambda's better.
- Whitespace fixing.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org
[GitHub] [jena] afs merged pull request #776: JENA-1937: SHACL Compact Syntax writer and jena-shacl clean-up.
Posted by GitBox <gi...@apache.org>.
afs merged pull request #776:
URL: https://github.com/apache/jena/pull/776
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org
[GitHub] [jena] afs commented on a change in pull request #776: JENA-1937: SHACL Compact Syntax writer and jena-shacl clean-up.
Posted by GitBox <gi...@apache.org>.
afs commented on a change in pull request #776:
URL: https://github.com/apache/jena/pull/776#discussion_r459368988
##########
File path: jena-shacl/src/main/java/org/apache/jena/shacl/Shapes.java
##########
@@ -189,7 +196,7 @@ public int numRootShapes() {
/** Iterator over the shapes with targets and with explicit type NodeShape or PropertyShape. */
public Iterator<Shape> iteratorAll() {
+ // rootsShapes and declShaes are disjoint so no dupicates in the iterator.
Review comment:
Done
##########
File path: jena-shacl/src/main/java/org/apache/jena/shacl/compact/writer/WriterRIOTShaclc.java
##########
@@ -0,0 +1,63 @@
+/*
+ * 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.shacl.compact.writer;
+
+import java.io.OutputStream;
+import java.io.Writer;
+
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.RiotLib;
+import org.apache.jena.riot.writer.WriterGraphRIOTBase;
+import org.apache.jena.shacl.Shapes;
+import org.apache.jena.shacl.compact.ShaclcWriter;
+import org.apache.jena.sparql.util.Context;
+
+public class WriterRIOTShaclc extends WriterGraphRIOTBase {
+
+ public WriterRIOTShaclc() {}
+
+ @Override
+ public Lang getLang() {
+ return Lang.SHACLC;
+ }
+
+ @Override
+ public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
+ IndentedWriter iOut = RiotLib.create(out) ;
+ iOut.setAbsoluteIndent(4);
+ write(iOut, graph, prefixMap, baseURI, context);
+ }
+
+ @Override
+ public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
+ IndentedWriter iOut = new IndentedWriter(out);
+ iOut.setUnitIndent(4);
+ write(iOut, graph, prefixMap, baseURI, context);
+ }
+
+ private void write(IndentedWriter out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
+ Shapes shapes = Shapes.parse(graph);
+ ShaclcWriter.print(out, shapes);
+ //out.flush();
Review comment:
Good catch. It should not be there but the routines that create an `IndentedWriter` should have a "flush". `IndentedWriter` has it's own buffering for chars to bytes. The builtin `IndentedWriter.stdout` or `IndentedWriter.stderr` have `setFlushOnNewline` (c.f. PrintStream autoFlush).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org
[GitHub] [jena] kinow commented on a change in pull request #776: JENA-1937: SHACL Compact Syntax writer and jena-shacl clean-up.
Posted by GitBox <gi...@apache.org>.
kinow commented on a change in pull request #776:
URL: https://github.com/apache/jena/pull/776#discussion_r459191133
##########
File path: jena-shacl/src/main/java/org/apache/jena/shacl/compact/writer/WriterRIOTShaclc.java
##########
@@ -0,0 +1,63 @@
+/*
+ * 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.shacl.compact.writer;
+
+import java.io.OutputStream;
+import java.io.Writer;
+
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.RiotLib;
+import org.apache.jena.riot.writer.WriterGraphRIOTBase;
+import org.apache.jena.shacl.Shapes;
+import org.apache.jena.shacl.compact.ShaclcWriter;
+import org.apache.jena.sparql.util.Context;
+
+public class WriterRIOTShaclc extends WriterGraphRIOTBase {
+
+ public WriterRIOTShaclc() {}
+
+ @Override
+ public Lang getLang() {
+ return Lang.SHACLC;
+ }
+
+ @Override
+ public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
+ IndentedWriter iOut = RiotLib.create(out) ;
+ iOut.setAbsoluteIndent(4);
+ write(iOut, graph, prefixMap, baseURI, context);
+ }
+
+ @Override
+ public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
+ IndentedWriter iOut = new IndentedWriter(out);
+ iOut.setUnitIndent(4);
+ write(iOut, graph, prefixMap, baseURI, context);
+ }
+
+ private void write(IndentedWriter out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
+ Shapes shapes = Shapes.parse(graph);
+ ShaclcWriter.print(out, shapes);
+ //out.flush();
Review comment:
Commented test/debug statement?
##########
File path: jena-shacl/src/main/java/org/apache/jena/shacl/Shapes.java
##########
@@ -189,7 +196,7 @@ public int numRootShapes() {
/** Iterator over the shapes with targets and with explicit type NodeShape or PropertyShape. */
public Iterator<Shape> iteratorAll() {
+ // rootsShapes and declShaes are disjoint so no dupicates in the iterator.
Review comment:
s/dupicates/duplicates
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@jena.apache.org
For additional commands, e-mail: pr-help@jena.apache.org