You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by jg...@apache.org on 2017/09/13 10:55:24 UTC
[1/6] any23 git commit: Simplify rdf graph structure
Repository: any23
Updated Branches:
refs/heads/master c40b7888b -> 09072c922
Simplify rdf graph structure
- if yaml document contains a map than the document become the map
- if String is a valid IRI than convert to IRI
- add additional unit test for parsing tree
Signed-off-by:Jacek Grzebyta <gr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/daf9b38f
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/daf9b38f
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/daf9b38f
Branch: refs/heads/master
Commit: daf9b38f249822ab424517cace77530daf08b093
Parents: b0baa94
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Thu Jul 13 18:09:39 2017 +0100
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Thu Jul 13 18:09:39 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/any23/vocab/YAML.java | 17 ++++++++---
.../any23/extractor/yaml/YAMLExtractor.java | 32 ++++++++++++++------
.../any23/extractor/yaml/YAMLExtractorTest.java | 20 +++++++++++-
.../org/apache/any23/extractor/yaml/tree.yml | 11 +++++++
4 files changed, 66 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/daf9b38f/api/src/main/java/org/apache/any23/vocab/YAML.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/YAML.java b/api/src/main/java/org/apache/any23/vocab/YAML.java
index 41df328..c4e488f 100644
--- a/api/src/main/java/org/apache/any23/vocab/YAML.java
+++ b/api/src/main/java/org/apache/any23/vocab/YAML.java
@@ -36,6 +36,10 @@ public class YAML extends Vocabulary {
public static final String DOCUMENT = "Document";
public static final String NODE = "Node";
+
+ public static final String SEQUENCE = "Sequence" ;
+
+ public static final String MAPPING = "Mapping";
public static final String CONTAINS = "contains";
@@ -49,6 +53,7 @@ public class YAML extends Vocabulary {
return _instance;
}
+ // Resources
/**
* <p>The root node. Representation of the YAML file. NB: one file may contain more than one documents
* represented by nodes; e.g. </p>
@@ -64,12 +69,16 @@ public class YAML extends Vocabulary {
* </p>
* Contains two documents.
*/
- public final IRI root = createProperty(NS, ROOT);
+ public final IRI root = createClass(NS, ROOT);
- public final IRI document = createProperty(NS, DOCUMENT);
-
- public final IRI node = createProperty(NS, NODE);
+ public final IRI document = createClass(NS, DOCUMENT);
+ public final IRI node = createClass(NS, NODE);
+
+ public final IRI sequence = createClass(NS, SEQUENCE);
+
+ public final IRI mapping = createClass(NS, MAPPING);
+ // property
public final IRI contains = createProperty(NS, CONTAINS);
}
http://git-wip-us.apache.org/repos/asf/any23/blob/daf9b38f/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
index 5c73082..bf70b63 100644
--- a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
@@ -17,6 +17,7 @@ package org.apache.any23.extractor.yaml;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -77,7 +78,7 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
Resource pageNode = YAMLExtractor.this.makeUri("document", documentURI);
out.writeTriple(documentRoot, vocab.contains, pageNode);
out.writeTriple(pageNode, RDF.TYPE, vocab.document);
- out.writeTriple(pageNode, vocab.contains, buildNode(documentURI, p, out));
+ buildNode(documentURI, p, out, pageNode);
}
}
@@ -87,7 +88,7 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
return YAMLExtractorFactory.getDescriptionInstance();
}
- private Value buildNode(IRI fileURI, Object treeData, ExtractionResult out) {
+ private Value buildNode(IRI fileURI, Object treeData, ExtractionResult out, Resource... parent) {
if (treeData != null) {
log.debug("object type: {}", treeData.getClass());
@@ -96,9 +97,9 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
if (treeData == null) {
return RDF.NIL;
} else if (treeData instanceof Map) {
- return processMap(fileURI, (Map) treeData, out);
+ return processMap(fileURI, (Map) treeData, out, parent);
} else if (treeData instanceof List) {
- return processList(fileURI, (List) treeData, out);
+ return processList(fileURI, (List) treeData, out, parent);
} else if (treeData instanceof Long) {
return RDFUtils.literal(((Long) treeData));
} else if (treeData instanceof Integer) {
@@ -112,16 +113,17 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
} else if (treeData instanceof Boolean) {
return RDFUtils.literal((Boolean) treeData);
} else {
- return RDFUtils.literal(((String) treeData));
+ return processString((String) treeData);
}
}
- private Value processMap(IRI file, Map<String, Object> node, ExtractionResult out) {
- Resource nodeURI = YAMLExtractor.this.makeUri(file);
+ private Value processMap(IRI file, Map<String, Object> node, ExtractionResult out, Resource... parent) {
+ Resource nodeURI = Arrays.asList(parent).isEmpty() ? YAMLExtractor.this.makeUri(file) : parent[0];
+
for (String k : node.keySet()) {
Resource predicate = makeUri(k, file, false);
Value value = buildNode(file, node.get(k), out);
- out.writeTriple(nodeURI, RDF.TYPE, vocab.node);
+ out.writeTriple(nodeURI, RDF.TYPE, vocab.mapping);
out.writeTriple(nodeURI, (IRI) predicate, value);
out.writeTriple(predicate, RDF.TYPE, RDF.PREDICATE);
out.writeTriple(predicate, RDFS.LABEL, RDFUtils.literal(k));
@@ -129,9 +131,13 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
return nodeURI;
}
- private Value processList(IRI fileURI, Iterable iter, ExtractionResult out) {
+ private Value processList(IRI fileURI, Iterable iter, ExtractionResult out, Resource... parent) {
Resource node = YAMLExtractor.this.makeUri();
out.writeTriple(node, RDF.TYPE, RDF.LIST);
+
+ if (!Arrays.asList(parent).isEmpty()) {
+ out.writeTriple(parent[0], vocab.contains, node);
+ }
Resource pList = null; // previous RDF iter node
Resource cList = node; // cutternt RDF iter node
@@ -152,6 +158,14 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
return node;
}
+
+ private Value processString(String str) {
+ if (RDFUtils.isAbsoluteIRI(str)) {
+ return RDFUtils.iri(str);
+ } else {
+ return RDFUtils.literal(str);
+ }
+ }
private Resource makeUri() {
Resource bnode = RDFUtils.bnode(Integer.toString(nodeId));
http://git-wip-us.apache.org/repos/asf/any23/blob/daf9b38f/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
index f2c85ba..fa8ae63 100644
--- a/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/yaml/YAMLExtractorTest.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
public class YAMLExtractorTest extends AbstractExtractorTestCase {
public static final Logger log = LoggerFactory.getLogger(YAMLExtractorTest.class);
-
+ public static final String ns = "http://bob.example.com/";
private static final YAML vocab = YAML.getInstance();
@Override
@@ -92,4 +92,22 @@ public class YAMLExtractorTest extends AbstractExtractorTestCase {
RepositoryResult<Statement> docs = getStatements(null, null, RDF.NIL);
Assert.assertTrue(Iterations.asList(docs).size() == 2);
}
+
+ @Test
+ public void treeTest() throws Exception {
+ assertExtract("/org/apache/any23/extractor/yaml/tree.yml");
+ log.debug(dumpModelToTurtle());
+ assertModelNotEmpty();
+ // validate part of the tree structure
+ assertContainsModel(new Statement[] {
+ RDFUtils.triple(RDFUtils.bnode(), RDFUtils.iri(ns, "value3"), RDFUtils.bnode("10")),
+ RDFUtils.triple(RDFUtils.bnode("10"), RDF.FIRST, RDFUtils.bnode("11")),
+ RDFUtils.triple(RDFUtils.bnode("11"), RDFUtils.iri(ns, "key3.1"), RDFUtils.bnode("12")),
+ RDFUtils.triple(RDFUtils.bnode("12"), RDF.TYPE, RDF.LIST),
+ RDFUtils.triple(RDFUtils.bnode("12"), RDF.FIRST, RDFUtils.literal("value3.1.1" ))
+ });
+
+ // validate occurence of <urn:value1> resource
+ assertContains(RDFUtils.triple(RDFUtils.bnode(), RDF.FIRST, RDFUtils.iri("urn:value1")));
+ }
}
http://git-wip-us.apache.org/repos/asf/any23/blob/daf9b38f/test-resources/src/test/resources/org/apache/any23/extractor/yaml/tree.yml
----------------------------------------------------------------------
diff --git a/test-resources/src/test/resources/org/apache/any23/extractor/yaml/tree.yml b/test-resources/src/test/resources/org/apache/any23/extractor/yaml/tree.yml
new file mode 100644
index 0000000..1727e2c
--- /dev/null
+++ b/test-resources/src/test/resources/org/apache/any23/extractor/yaml/tree.yml
@@ -0,0 +1,11 @@
+%YAML 1.2
+---
+- urn:value1
+- value2
+-
+ value3 :
+ - key3.1:
+ - value3.1.1
+ - value3.1.2
+ - value3.1.3
+ - key3.2: value3.2.1
[5/6] any23 git commit: Fix testing issue
Posted by jg...@apache.org.
Fix testing issue
- add documentation to RDFUtils class
Signed-off-by:Jacek Grzebyta <gr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/5a4d3429
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/5a4d3429
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/5a4d3429
Branch: refs/heads/master
Commit: 5a4d3429a098307debb2432641e5c7dc827301c9
Parents: 94caa68
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Sat Sep 9 21:13:37 2017 +0100
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Sat Sep 9 21:13:37 2017 +0100
----------------------------------------------------------------------
.../any23/extractor/yaml/YAMLExtractor.java | 6 +++-
.../java/org/apache/any23/rdf/RDFUtils.java | 31 ++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/5a4d3429/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
index 4eae6b9..ab411da 100644
--- a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
@@ -123,7 +123,11 @@ public class YAMLExtractor implements Extractor.ContentExtractor {
for (String k : node.keySet()) {
- Resource predicate = RDFUtils.makeIRI(k, file, true);
+ /* False prevents adding _<int> to the predicate.
+ Thus the predicate pattern is:
+ "some string" ---> ns:someString
+ */
+ Resource predicate = RDFUtils.makeIRI(k, file, false);
Value value = buildNode(file, node.get(k), out);
out.writeTriple(nodeURI, RDF.TYPE, vocab.mapping);
out.writeTriple(nodeURI, (IRI) predicate, value);
http://git-wip-us.apache.org/repos/asf/any23/blob/5a4d3429/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/rdf/RDFUtils.java b/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
index f6e3a8c..498b01d 100644
--- a/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
+++ b/core/src/main/java/org/apache/any23/rdf/RDFUtils.java
@@ -573,14 +573,45 @@ public class RDFUtils {
}
}
+ /**
+ * Ref {@link #makeIRI(java.lang.String, org.eclipse.rdf4j.model.IRI, boolean) }.
+ * @param docUri
+ * @return
+ */
public static Resource makeIRI(IRI docUri) {
return makeIRI("node", docUri);
}
+ /**
+ * Ref {@link #makeIRI(java.lang.String, org.eclipse.rdf4j.model.IRI, boolean) }.
+ * @param type
+ * @param docIRI
+ * @return
+ */
public static Resource makeIRI(String type, IRI docIRI) {
return makeIRI(type, docIRI, false);
}
+ /**
+ * Creates implementation of {@link Resource} from given arguments: <it>type</it> and
+ * <it>docIRI</it>.
+ * <ul>
+ * <li>The <it>type</type> argument is converted following Java naming conventions with
+ * {@link StringUtils#implementJavaNaming(java.lang.String) }.
+ *
+ * <li>The <it>docIRI</it> is treated as a namespace. If it ends with '/' character than
+ * stays unchanged otherwise the hash character '#' is added.
+ *
+ * <li>If <it>addId</it> is TRUE than combination of underscore and the node identifier is added to
+ * the end ('{@code_<int>'}).
+ * </ul>
+ *
+ * @param type
+ * @param docIRI
+ * @param addId
+ * @return {@link Resource} implementation
+ * @see http://www.geeksforgeeks.org/java-naming-conventions/
+ */
public static Resource makeIRI(String type, IRI docIRI, boolean addId) {
// preprocess string: converts - -> _
[6/6] any23 git commit: Merge branch 'ANY23-311' of
https://github.com/jgrzebyta/any23
Posted by jg...@apache.org.
Merge branch 'ANY23-311' of https://github.com/jgrzebyta/any23
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/09072c92
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/09072c92
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/09072c92
Branch: refs/heads/master
Commit: 09072c9221a89bbe1660310d935e912a050df45c
Parents: c40b788 5a4d342
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Wed Sep 13 11:46:46 2017 +0100
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Wed Sep 13 11:46:46 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/any23/vocab/YAML.java | 17 +++--
.../any23/extractor/yaml/YAMLExtractor.java | 72 +++++++++++++++++---
.../java/org/apache/any23/rdf/RDFUtils.java | 31 +++++++++
.../any23/extractor/yaml/YAMLExtractorTest.java | 20 +++++-
.../apache/any23/vocab/RDFSchemaUtilsTest.java | 4 +-
.../org/apache/any23/extractor/yaml/tree.yml | 11 +++
6 files changed, 138 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[4/6] any23 git commit: Merge branch 'master' into ANY23-311
Posted by jg...@apache.org.
Merge branch 'master' into ANY23-311
- Resolve conflict in YAMLExtractor.java
Signed-off-by:Jacek Grzebyta <gr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/94caa68e
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/94caa68e
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/94caa68e
Branch: refs/heads/master
Commit: 94caa68ec6f0a86281c147667e75bbd044e4f658
Parents: a56d549 c40b788
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Tue Aug 29 12:41:16 2017 +0100
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Tue Aug 29 12:41:16 2017 +0100
----------------------------------------------------------------------
.../configuration/DefaultConfiguration.java | 23 +-
.../DefaultModifiableConfiguration.java | 4 +-
.../apache/any23/extractor/ExtractorGroup.java | 14 +-
.../java/org/apache/any23/vocab/Vocabulary.java | 26 +-
.../resources/default-configuration.properties | 4 +
cli/pom.xml | 22 +
.../org/apache/any23/cli/PluginVerifier.java | 8 +-
.../main/java/org/apache/any23/cli/Rover.java | 10 +-
.../java/org/apache/any23/cli/ToolRunner.java | 7 +-
.../org/apache/any23/cli/ToolRunnerTest.java | 15 +-
.../any23/extractor/ExtractorRegistryImpl.java | 30 +-
.../extractor/SingleDocumentExtraction.java | 6 +-
.../extractor/html/EmbeddedJSONLDExtractor.java | 4 +-
.../any23/extractor/html/GeoExtractor.java | 7 +-
.../any23/extractor/html/TagSoupParser.java | 2 -
.../any23/extractor/xpath/XPathExtractor.java | 3 +-
.../any23/extractor/yaml/YAMLExtractor.java | 18 +-
.../java/org/apache/any23/rdf/RDFUtils.java | 50 +-
.../java/org/apache/any23/util/StreamUtils.java | 69 +-
.../any23/extractor/ExtractionAPITest.java | 4 +-
.../extractor/ExtractionResultImplTest.java | 2 +-
csvutils/pom.xml | 2 +-
encoding/pom.xml | 2 +-
openie/pom.xml | 153 +++++
.../any23/extractor/openie/OpenIEExtractor.java | 130 ++++
.../openie/OpenIEExtractorFactory.java | 52 ++
.../org.apache.any23.extractor.ExtractorFactory | 1 +
.../any23/openie/OpenIEExtractorTest.java | 88 +++
plugins/basic-crawler/pom.xml | 53 +-
plugins/html-scraper/pom.xml | 19 -
plugins/integration-test/pom.xml | 16 +-
.../java/org/apache/any23/plugin/PluginIT.java | 40 +-
plugins/office-scraper/pom.xml | 19 -
pom.xml | 19 +-
service/pom.xml | 2 +-
src/site/apt/any23-plugins.apt | 16 +-
src/site/apt/configuration.apt | 8 +-
src/site/apt/dev-csv-extractor.apt | 2 +-
src/site/apt/dev-data-conversion.apt | 20 +-
src/site/apt/dev-data-extraction.apt | 20 +-
src/site/apt/dev-microformat-extractors.apt | 12 +-
src/site/apt/dev-validation-fix.apt | 12 +-
src/site/apt/dev-xpath-extractor.apt | 2 +-
src/site/apt/extractors.apt | 50 +-
src/site/apt/getting-started.apt | 2 +-
src/site/apt/plugin-basic-crawler.apt | 4 +-
src/site/apt/plugin-office-scraper.apt | 2 +-
.../any23/extractor/openie/example-openie.html | 638 +++++++++++++++++++
48 files changed, 1451 insertions(+), 261 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/94caa68e/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
index bf70b63,1e968c0..4eae6b9
--- a/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/yaml/YAMLExtractor.java
@@@ -75,10 -74,10 +76,10 @@@ public class YAMLExtractor implements E
// Iterate over page(s)
for (Object p : docIterate) {
- Resource pageNode = YAMLExtractor.this.makeUri("document", documentURI);
+ Resource pageNode = RDFUtils.makeIRI("document", documentIRI, true);
out.writeTriple(documentRoot, vocab.contains, pageNode);
out.writeTriple(pageNode, RDF.TYPE, vocab.document);
- buildNode(documentURI, p, out, pageNode);
- out.writeTriple(pageNode, vocab.contains, buildNode(documentIRI, p, out));
++ buildNode(documentIRI, p, out, pageNode);
}
}
@@@ -117,13 -116,12 +118,14 @@@
}
}
- private Value processMap(IRI file, Map<String, Object> node, ExtractionResult out) {
- Resource nodeURI = RDFUtils.makeIRI(file);
+ private Value processMap(IRI file, Map<String, Object> node, ExtractionResult out, Resource... parent) {
+ Resource nodeURI = Arrays.asList(parent).isEmpty() ? YAMLExtractor.this.makeUri(file) : parent[0];
+
++
for (String k : node.keySet()) {
- Resource predicate = makeUri(k, file, false);
+ Resource predicate = RDFUtils.makeIRI(k, file, true);
Value value = buildNode(file, node.get(k), out);
- out.writeTriple(nodeURI, RDF.TYPE, vocab.node);
+ out.writeTriple(nodeURI, RDF.TYPE, vocab.mapping);
out.writeTriple(nodeURI, (IRI) predicate, value);
out.writeTriple(predicate, RDF.TYPE, RDF.PREDICATE);
out.writeTriple(predicate, RDFS.LABEL, RDFUtils.literal(k));
@@@ -172,36 -158,4 +174,36 @@@
nodeId++;
return bnode;
}
+
+ private Resource makeUri(IRI docUri) {
+ return makeUri("node", docUri);
- }
++}
+
+ private Resource makeUri(String type, IRI docUri) {
+ return makeUri(type, docUri, true);
+ }
+
+ private Resource makeUri(String type, IRI docUri, boolean addId) {
+
+ // preprocess string: converts - -> _
+ // converts <space>: word1 word2 -> word1Word2
+ String newType = StringUtils.implementJavaNaming(type);
+
+ String uriString;
+ if (docUri.toString().endsWith("/")) {
+ uriString = docUri.toString() + newType;
+ } else {
+ uriString = docUri.toString() + "#" + newType;
+ }
+
+ if (addId) {
+ uriString = uriString + "_" + Integer.toString(nodeId);
+ }
+
+ Resource node = RDFUtils.uri(uriString);
+ if (addId) {
+ nodeId++;
+ }
+ return node;
+ }
}
[2/6] any23 git commit: Update values in RDFSchemaUtilsTest.java
Posted by jg...@apache.org.
Update values in RDFSchemaUtilsTest.java
Signed-off-by:Jacek Grzebyta <gr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/cd8dbf0a
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/cd8dbf0a
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/cd8dbf0a
Branch: refs/heads/master
Commit: cd8dbf0a56df58d7e2d694ce0ba8533c5745aa31
Parents: daf9b38
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Thu Jul 13 20:19:02 2017 +0100
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Thu Jul 13 20:19:02 2017 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/any23/vocab/RDFSchemaUtilsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/cd8dbf0a/core/src/test/java/org/apache/any23/vocab/RDFSchemaUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/any23/vocab/RDFSchemaUtilsTest.java b/core/src/test/java/org/apache/any23/vocab/RDFSchemaUtilsTest.java
index 85625f7..f1afd4a 100644
--- a/core/src/test/java/org/apache/any23/vocab/RDFSchemaUtilsTest.java
+++ b/core/src/test/java/org/apache/any23/vocab/RDFSchemaUtilsTest.java
@@ -43,7 +43,7 @@ public class RDFSchemaUtilsTest {
*/
@Test
public void testSerializeVocabulariesNTriples() {
- serializeVocabularies(RDFFormat.NTRIPLES, 2098);
+ serializeVocabularies(RDFFormat.NTRIPLES, 2102);
}
/**
@@ -53,7 +53,7 @@ public class RDFSchemaUtilsTest {
*/
@Test
public void testSerializeVocabulariesRDFXML() {
- serializeVocabularies(RDFFormat.RDFXML, 5479); // Effective lines + separators.
+ serializeVocabularies(RDFFormat.RDFXML, 5489); // Effective lines + separators.
}
private void serializeVocabularies(RDFFormat format, int expectedLines) {
[3/6] any23 git commit: Merge branch 'master' into ANY23-311
Posted by jg...@apache.org.
Merge branch 'master' into ANY23-311
Signed-off-by: Jacek Grzebyta <gr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/a56d5495
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/a56d5495
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/a56d5495
Branch: refs/heads/master
Commit: a56d5495cffff79c1fcca7620cf4e0eea1a1458a
Parents: cd8dbf0 72035bf
Author: Jacek Grzebyta <gr...@gmail.com>
Authored: Wed Jul 26 22:09:41 2017 +0100
Committer: Jacek Grzebyta <gr...@gmail.com>
Committed: Wed Jul 26 22:10:18 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/any23/vocab/CSV.java | 2 +-
.../java/org/apache/any23/vocab/SINDICE.java | 1 -
.../main/java/org/apache/any23/cli/Rover.java | 4 +-
.../org/apache/any23/cli/SimpleRoverTest.java | 126 +++++++++++++++++++
cli/src/test/resources/log4j.properties | 2 +-
.../any23/writer/CompositeTripleHandler.java | 4 +-
.../any23/writer/LoggingTripleHandler.java | 31 +++--
.../apache/any23/prefixes/prefixes.properties | 21 ++--
.../main/java/org/apache/any23/vocab/Excel.java | 2 +-
.../org/apache/any23/servlet/ServletTest.java | 2 +-
src/site/xdoc/download.xml.vm | 14 +--
11 files changed, 171 insertions(+), 38 deletions(-)
----------------------------------------------------------------------