You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by an...@apache.org on 2017/01/13 22:25:46 UTC
[07/25] any23 git commit: ANY23-276 : Convert from Sesame to RDF4J
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HCardExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HCardExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HCardExtractor.java
index ebdd77b..2a2cae8 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HCardExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HCardExtractor.java
@@ -23,11 +23,10 @@ import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
import org.apache.any23.extractor.html.HTMLDocument;
import org.apache.any23.vocab.HCard;
-import org.apache.any23.vocab.VCard;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.extractor.html.DomUtils;
@@ -182,7 +181,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
private void mapFieldWithProperty(HTMLDocument fragment, BNode card, String fieldClass,
- URI property) {
+ IRI property) {
HTMLDocument.TextField title = fragment.getSingularTextField(fieldClass);
conditionallyAddStringProperty(
title.source(), card, property, title.value()
@@ -233,7 +232,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] emails = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + cardFields[8]);
for(HTMLDocument.TextField email : emails) {
- addURIProperty(card, vCARD.email, fragment.resolveURI(email.value()));
+ addIRIProperty(card, vCARD.email, fragment.resolveIRI(email.value()));
}
}
@@ -243,7 +242,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
(Microformats2Prefixes.URL_PROPERTY_PREFIX + cardFields[9]);
if(logo.source()==null)
return;
- addURIProperty(card, vCARD.logo, fragment.resolveURI(logo.value()));
+ addIRIProperty(card, vCARD.logo, fragment.resolveIRI(logo.value()));
}
private void addPhoto(HTMLDocument fragment, BNode card) throws ExtractionException {
@@ -251,14 +250,14 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
(Microformats2Prefixes.URL_PROPERTY_PREFIX + cardFields[10]);
if(photo.source()==null)
return;
- addURIProperty(card, vCARD.photo, fragment.resolveURI(photo.value()));
+ addIRIProperty(card, vCARD.photo, fragment.resolveIRI(photo.value()));
}
private void addURLs(HTMLDocument fragment, BNode card) throws ExtractionException {
final HTMLDocument.TextField[] urls = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + cardFields[11]);
for(HTMLDocument.TextField url : urls) {
- addURIProperty(card, vCARD.url, fragment.resolveURI(url.value()));
+ addIRIProperty(card, vCARD.url, fragment.resolveIRI(url.value()));
}
}
@@ -268,7 +267,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
(Microformats2Prefixes.URL_PROPERTY_PREFIX + cardFields[12]);
if(uid.source()==null)
return;
- addURIProperty(card, vCARD.uid, fragment.resolveURI(uid.value()));
+ addIRIProperty(card, vCARD.uid, fragment.resolveIRI(uid.value()));
}
@@ -335,7 +334,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
(Microformats2Prefixes.URL_PROPERTY_PREFIX + cardFields[17]);
if(uid.source()==null)
return;
- addURIProperty(card, vCARD.key, fragment.resolveURI(uid.value()));
+ addIRIProperty(card, vCARD.key, fragment.resolveIRI(uid.value()));
}
private void addOrg(HTMLDocument fragment, BNode card) {
@@ -358,7 +357,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
(Microformats2Prefixes.URL_PROPERTY_PREFIX + cardFields[21]);
if(impp.source()==null)
return;
- addURIProperty(card, vCARD.impp, fragment.resolveURI(impp.value()));
+ addIRIProperty(card, vCARD.impp, fragment.resolveIRI(impp.value()));
}
private void addSex(HTMLDocument fragment, BNode card) {
@@ -400,7 +399,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
return;
for (Node node : nodes) {
BNode location = valueFactory.createBNode();
- addURIProperty(location, RDF.TYPE, vCARD.Address);
+ addIRIProperty(location, RDF.TYPE, vCARD.Address);
HTMLDocument fragment = new HTMLDocument(node);
for (String field : addressFields) {
HTMLDocument.TextField[] values = fragment.getPluralTextField(Microformats2Prefixes.PROPERTY_PREFIX+field);
@@ -425,7 +424,7 @@ public class HCardExtractor extends EntityBasedMicroformatExtractor {
return;
for (Node node : nodes) {
BNode location = valueFactory.createBNode();
- addURIProperty(location, RDF.TYPE, vCARD.Geo);
+ addIRIProperty(location, RDF.TYPE, vCARD.Geo);
HTMLDocument fragment = new HTMLDocument(node);
for (String field : geoFields) {
HTMLDocument.TextField[] values = fragment.getPluralTextField(Microformats2Prefixes.PROPERTY_PREFIX+field);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEntryExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEntryExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEntryExtractor.java
index 3a85b5b..d85b9d6 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEntryExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEntryExtractor.java
@@ -25,11 +25,11 @@ import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.extractor.html.HTMLDocument;
import org.apache.any23.vocab.HEntry;
import org.apache.any23.vocab.VCard;
-import org.openrdf.model.BNode;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
-import org.openrdf.model.Resource;
+import org.eclipse.rdf4j.model.Resource;
import java.util.List;
@@ -110,14 +110,14 @@ public class HEntryExtractor extends EntityBasedMicroformatExtractor {
HCardExtractor extractor = factory.createExtractor();
for (Node node : nodes) {
BNode author = valueFactory.createBNode();
- addURIProperty(author, RDF.TYPE, vEntry.author);
+ addIRIProperty(author, RDF.TYPE, vEntry.author);
extractor.extractEntityAsEmbeddedProperty(new HTMLDocument(node), author,
getCurrentExtractionResult());
}
}
private void mapFieldWithProperty(HTMLDocument fragment, BNode entry, String fieldClass,
- URI property) {
+ IRI property) {
HTMLDocument.TextField title = fragment.getSingularTextField(fieldClass);
conditionallyAddStringProperty(
title.source(), entry, property, title.value()
@@ -191,7 +191,7 @@ public class HEntryExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] urls = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + entryFields[6]);
for(HTMLDocument.TextField url : urls) {
- addURIProperty(entry, vEntry.url, fragment.resolveURI(url.value()));
+ addIRIProperty(entry, vEntry.url, fragment.resolveIRI(url.value()));
}
}
@@ -200,14 +200,14 @@ public class HEntryExtractor extends EntityBasedMicroformatExtractor {
(Microformats2Prefixes.URL_PROPERTY_PREFIX + entryFields[7]);
if(uid.source()==null)
return;
- addURIProperty(entry, vEntry.uid, fragment.resolveURI(uid.value()));
+ addIRIProperty(entry, vEntry.uid, fragment.resolveIRI(uid.value()));
}
private void addSyndications(HTMLDocument fragment, BNode entry) throws ExtractionException {
final HTMLDocument.TextField[] syndications = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + entryFields[8]);
for(HTMLDocument.TextField syndication : syndications) {
- addURIProperty(entry, vEntry.syndication, fragment.resolveURI(syndication.value()));
+ addIRIProperty(entry, vEntry.syndication, fragment.resolveIRI(syndication.value()));
}
}
@@ -216,7 +216,7 @@ public class HEntryExtractor extends EntityBasedMicroformatExtractor {
(Microformats2Prefixes.URL_PROPERTY_PREFIX + entryFields[9]);
if(inReplyTo.source()==null)
return;
- addURIProperty(entry, vEntry.in_reply_to, fragment.resolveURI(inReplyTo.value()));
+ addIRIProperty(entry, vEntry.in_reply_to, fragment.resolveIRI(inReplyTo.value()));
}
private void addLocations(HTMLDocument doc, Resource entry) throws ExtractionException {
@@ -226,7 +226,7 @@ public class HEntryExtractor extends EntityBasedMicroformatExtractor {
return;
for (Node node : nodes) {
BNode location = valueFactory.createBNode();
- addURIProperty(location, RDF.TYPE, vEntry.location);
+ addIRIProperty(location, RDF.TYPE, vEntry.location);
HTMLDocument fragment = new HTMLDocument(node);
for (String field : geoFields) {
HTMLDocument.TextField[] values = fragment.getPluralTextField(Microformats2Prefixes.PROPERTY_PREFIX+field);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEventExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEventExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEventExtractor.java
index 67a476f..a936d70 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEventExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HEventExtractor.java
@@ -20,14 +20,13 @@ package org.apache.any23.extractor.html.microformats2;
import org.apache.any23.extractor.ExtractionException;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.apache.any23.extractor.TagSoupExtractionResult;
import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.vocab.HEvent;
import org.apache.any23.vocab.VCard;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
import org.apache.any23.extractor.html.HTMLDocument;
@@ -126,14 +125,14 @@ public class HEventExtractor extends EntityBasedMicroformatExtractor {
HCardExtractor extractor = factory.createExtractor();
for (Node node : nodes) {
BNode attendee = valueFactory.createBNode();
- addURIProperty(attendee, RDF.TYPE, vEvent.attendee);
+ addIRIProperty(attendee, RDF.TYPE, vEvent.attendee);
extractor.extractEntityAsEmbeddedProperty(new HTMLDocument(node), attendee,
getCurrentExtractionResult());
}
}
private void mapFieldWithProperty(HTMLDocument fragment, BNode recipe, String fieldClass,
- URI property) {
+ IRI property) {
HTMLDocument.TextField title = fragment.getSingularTextField(fieldClass);
conditionallyAddStringProperty(
title.source(), recipe, property, title.value()
@@ -216,7 +215,7 @@ public class HEventExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] urls = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + eventFields[6]);
for(HTMLDocument.TextField url : urls) {
- addURIProperty(event, vEvent.url, fragment.resolveURI(url.value()));
+ addIRIProperty(event, vEvent.url, fragment.resolveIRI(url.value()));
}
}
@@ -237,7 +236,7 @@ public class HEventExtractor extends EntityBasedMicroformatExtractor {
return;
for (Node node : nodes) {
BNode location = valueFactory.createBNode();
- addURIProperty(location, RDF.TYPE, vEvent.location);
+ addIRIProperty(location, RDF.TYPE, vEvent.location);
HTMLDocument fragment = new HTMLDocument(node);
for (String field : geoFields) {
HTMLDocument.TextField[] values = fragment.getPluralTextField(Microformats2Prefixes.PROPERTY_PREFIX+field);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HGeoExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HGeoExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HGeoExtractor.java
index c9c061a..fcfd293 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HGeoExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HGeoExtractor.java
@@ -21,8 +21,8 @@ import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
import org.apache.any23.vocab.VCard;
-import org.openrdf.model.BNode;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.extractor.html.HTMLDocument;
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HItemExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HItemExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HItemExtractor.java
index 4478dc0..3a9f8a2 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HItemExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HItemExtractor.java
@@ -22,9 +22,9 @@ import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
import org.apache.any23.vocab.HItem;
-import org.openrdf.model.BNode;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.extractor.html.HTMLDocument;
@@ -73,7 +73,7 @@ public class HItemExtractor extends EntityBasedMicroformatExtractor {
return true;
}
- private void mapFieldWithProperty(HTMLDocument fragment, BNode item, String fieldClass, URI property) {
+ private void mapFieldWithProperty(HTMLDocument fragment, BNode item, String fieldClass, IRI property) {
HTMLDocument.TextField title = fragment.getSingularTextField(fieldClass);
conditionallyAddStringProperty(
title.source(),item, property, title.value()
@@ -88,7 +88,7 @@ public class HItemExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] photos = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX+itemFields[2]);
for(HTMLDocument.TextField photo : photos) {
- addURIProperty(item, vHITEM.photo, fragment.resolveURI(photo.value()));
+ addIRIProperty(item, vHITEM.photo, fragment.resolveIRI(photo.value()));
}
}
@@ -96,7 +96,7 @@ public class HItemExtractor extends EntityBasedMicroformatExtractor {
HTMLDocument.TextField[] links = fragment.getPluralUrlField(Microformats2Prefixes.URL_PROPERTY_PREFIX+
itemFields[1]);
for (HTMLDocument.TextField link : links) {
- conditionallyAddResourceProperty(item, vHITEM.url, getHTMLDocument().resolveURI(link.value()));
+ conditionallyAddResourceProperty(item, vHITEM.url, getHTMLDocument().resolveIRI(link.value()));
}
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HProductExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HProductExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HProductExtractor.java
index 0673a1d..2073768 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HProductExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HProductExtractor.java
@@ -23,10 +23,10 @@ import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.extractor.html.HTMLDocument;
import org.apache.any23.vocab.HProduct;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
import java.util.List;
@@ -85,7 +85,7 @@ public class HProductExtractor extends EntityBasedMicroformatExtractor {
}
private void mapFieldWithProperty(HTMLDocument fragment, BNode product, String fieldClass,
- URI property) {
+ IRI property) {
HTMLDocument.TextField title = fragment.getSingularTextField(fieldClass);
conditionallyAddStringProperty(
title.source(), product, property, title.value()
@@ -101,7 +101,7 @@ public class HProductExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] photos = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + productFields[1]);
for(HTMLDocument.TextField photo : photos) {
- addURIProperty(product, vProduct.photo, fragment.resolveURI(photo.value()));
+ addIRIProperty(product, vProduct.photo, fragment.resolveIRI(photo.value()));
}
}
@@ -124,7 +124,7 @@ public class HProductExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] urls = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + productFields[5]);
for(HTMLDocument.TextField url : urls) {
- addURIProperty(product, vProduct.url, fragment.resolveURI(url.value()));
+ addIRIProperty(product, vProduct.url, fragment.resolveIRI(url.value()));
}
}
@@ -132,7 +132,7 @@ public class HProductExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] identifiers = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX + productFields[6]);
for(HTMLDocument.TextField identifier :identifiers) {
- addURIProperty(product, vProduct.identifier, fragment.resolveURI(identifier.value()));
+ addIRIProperty(product, vProduct.identifier, fragment.resolveIRI(identifier.value()));
}
}
@@ -164,7 +164,7 @@ public class HProductExtractor extends EntityBasedMicroformatExtractor {
HCardExtractor extractor = factory.createExtractor();
for (Node node : nodes) {
BNode brand = valueFactory.createBNode();
- addURIProperty(brand, RDF.TYPE, vProduct.brand);
+ addIRIProperty(brand, RDF.TYPE, vProduct.brand);
extractor.extractEntityAsEmbeddedProperty(new HTMLDocument(node), brand,
getCurrentExtractionResult());
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HRecipeExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HRecipeExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HRecipeExtractor.java
index d4bf12e..4ce9643 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HRecipeExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HRecipeExtractor.java
@@ -21,9 +21,9 @@ import org.apache.any23.extractor.ExtractionException;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.vocab.HRecipe;
-import org.openrdf.model.BNode;
-import org.openrdf.model.URI;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.extractor.html.HTMLDocument;
@@ -84,7 +84,7 @@ public class HRecipeExtractor extends EntityBasedMicroformatExtractor {
return true;
}
- private void mapFieldWithProperty(HTMLDocument fragment, BNode recipe, String fieldClass, URI property) {
+ private void mapFieldWithProperty(HTMLDocument fragment, BNode recipe, String fieldClass, IRI property) {
HTMLDocument.TextField title = fragment.getSingularTextField(fieldClass);
conditionallyAddStringProperty(
title.source(), recipe, property, title.value()
@@ -139,7 +139,7 @@ public class HRecipeExtractor extends EntityBasedMicroformatExtractor {
final HTMLDocument.TextField[] photos = fragment.getPluralUrlField
(Microformats2Prefixes.URL_PROPERTY_PREFIX+recipeFields[5]);
for(HTMLDocument.TextField photo : photos) {
- addURIProperty(recipe, vHRECIPE.photo, fragment.resolveURI(photo.value()));
+ addIRIProperty(recipe, vHRECIPE.photo, fragment.resolveIRI(photo.value()));
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/html/microformats2/HResumeExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HResumeExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HResumeExtractor.java
index 06f4f3c..aa0a9eb 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/microformats2/HResumeExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/microformats2/HResumeExtractor.java
@@ -22,9 +22,9 @@ import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.TagSoupExtractionResult;
import org.apache.any23.vocab.HResume;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.BNode;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
import org.w3c.dom.Node;
import org.apache.any23.extractor.html.EntityBasedMicroformatExtractor;
import org.apache.any23.extractor.html.HTMLDocument;
@@ -102,7 +102,7 @@ public class HResumeExtractor extends EntityBasedMicroformatExtractor {
HCardExtractor extractor = factory.createExtractor();
for (Node node : nodes) {
BNode contact = valueFactory.createBNode();
- addURIProperty(contact, RDF.TYPE, vResume.contact);
+ addIRIProperty(contact, RDF.TYPE, vResume.contact);
extractor.extractEntityAsEmbeddedProperty(new HTMLDocument(node), contact,
getCurrentExtractionResult());
}
@@ -117,7 +117,7 @@ public class HResumeExtractor extends EntityBasedMicroformatExtractor {
HCardExtractor extractor = factory.createExtractor();
for (Node node : nodes) {
BNode affiliation = valueFactory.createBNode();
- addURIProperty(affiliation, RDF.TYPE, vResume.affiliation);
+ addIRIProperty(affiliation, RDF.TYPE, vResume.affiliation);
extractor.extractEntityAsEmbeddedProperty(new HTMLDocument(node), affiliation,
getCurrentExtractionResult());
}
@@ -168,7 +168,7 @@ public class HResumeExtractor extends EntityBasedMicroformatExtractor {
HEventExtractor extractor = factory.createExtractor();
for (Node node : nodes) {
BNode event = valueFactory.createBNode();
- addURIProperty(event, RDF.TYPE, vResume.experience);
+ addIRIProperty(event, RDF.TYPE, vResume.experience);
extractor.extractEntityAsEmbeddedProperty(new HTMLDocument(node), event,
getCurrentExtractionResult());
}
@@ -183,7 +183,7 @@ public class HResumeExtractor extends EntityBasedMicroformatExtractor {
HEventExtractor extractor = factory.createExtractor();
for (Node node : nodes) {
BNode event = valueFactory.createBNode();
- addURIProperty(event, RDF.TYPE, vResume.education);
+ addIRIProperty(event, RDF.TYPE, vResume.education);
extractor.extractEntityAsEmbeddedProperty(new HTMLDocument(node), event,
getCurrentExtractionResult());
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java b/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java
index 38b6e60..0688fb8 100644
--- a/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java
+++ b/core/src/main/java/org/apache/any23/extractor/microdata/ItemPropValue.java
@@ -215,7 +215,7 @@ public class ItemPropValue {
try {
return new URL((String) content);
} catch (MalformedURLException murle) {
- throw new IllegalStateException("Error while parsing URI.", murle);
+ throw new IllegalStateException("Error while parsing IRI.", murle);
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java
index d93c069..636f4d2 100644
--- a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java
@@ -28,12 +28,12 @@ import org.apache.any23.extractor.html.DomUtils;
import org.apache.any23.rdf.RDFUtils;
import org.apache.any23.vocab.DCTerms;
import org.apache.any23.vocab.XHTML;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.vocabulary.RDF;
-import org.openrdf.model.vocabulary.XMLSchema;
+import org.eclipse.rdf4j.model.Literal;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -57,8 +57,8 @@ import java.util.Set;
*/
public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
- private static final URI MICRODATA_ITEM
- = RDFUtils.uri("http://www.w3.org/1999/xhtml/microdata#item");
+ private static final IRI MICRODATA_ITEM
+ = RDFUtils.iri("http://www.w3.org/1999/xhtml/microdata#item");
private String documentLanguage;
@@ -105,12 +105,12 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
/**
* 5.2.6
*/
- final URI documentURI = extractionContext.getDocumentURI();
+ final IRI documentIRI = extractionContext.getDocumentIRI();
final Map<ItemScope, Resource> mappings = new HashMap<ItemScope, Resource>();
for (ItemScope itemScope : itemScopes) {
- Resource subject = processType(itemScope, documentURI, out, mappings);
+ Resource subject = processType(itemScope, documentIRI, out, mappings);
out.writeTriple(
- documentURI,
+ documentIRI,
MICRODATA_ITEM,
subject
);
@@ -119,20 +119,20 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
/**
* 5.2.1
*/
- processTitle(in, documentURI, out);
+ processTitle(in, documentIRI, out);
/**
* 5.2.2
*/
- processHREFElements(in, documentURI, out);
+ processHREFElements(in, documentIRI, out);
/**
* 5.2.3
*/
- processMetaElements(in, documentURI, out);
+ processMetaElements(in, documentIRI, out);
/**
* 5.2.4
*/
- processCiteElements(in, documentURI, out);
+ processCiteElements(in, documentIRI, out);
}
/**
@@ -170,10 +170,10 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* extraction algorithm.
*
* @param in {@link Document} to be processed.
- * @param documentURI Document current {@link URI}.
+ * @param documentIRI Document current {@link IRI}.
* @param out a valid not <code>null</code> {@link ExtractionResult}
*/
- private void processTitle(Document in, URI documentURI, ExtractionResult out) {
+ private void processTitle(Document in, IRI documentIRI, ExtractionResult out) {
NodeList titles = in.getElementsByTagName("title");
// just one title is allowed.
if (titles.getLength() == 1) {
@@ -188,7 +188,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
object = RDFUtils.literal(titleValue, lang);
}
out.writeTriple(
- documentURI,
+ documentIRI,
DCTerms.getInstance().title,
object
);
@@ -200,21 +200,21 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* extraction algorithm.
*
* @param in {@link Document} to be processed.
- * @param documentURI Document current {@link URI}.
+ * @param documentIRI Document current {@link IRI}.
* @param out a valid not <code>null</code> {@link ExtractionResult}
*/
- private void processHREFElements(Document in, URI documentURI, ExtractionResult out) {
+ private void processHREFElements(Document in, IRI documentIRI, ExtractionResult out) {
NodeList anchors = in.getElementsByTagName("a");
for (int i = 0; i < anchors.getLength(); i++) {
- processHREFElement(anchors.item(i), documentURI, out);
+ processHREFElement(anchors.item(i), documentIRI, out);
}
NodeList areas = in.getElementsByTagName("area");
for (int i = 0; i < areas.getLength(); i++) {
- processHREFElement(areas.item(i), documentURI, out);
+ processHREFElement(areas.item(i), documentIRI, out);
}
NodeList links = in.getElementsByTagName("link");
for (int i = 0; i < links.getLength(); i++) {
- processHREFElement(links.item(i), documentURI, out);
+ processHREFElement(links.item(i), documentIRI, out);
}
}
@@ -223,10 +223,10 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* extraction algorithm.
*
* @param item {@link Node} to be processed.
- * @param documentURI Document current {@link URI}.
+ * @param documentIRI Document current {@link IRI}.
* @param out a valid not <code>null</code> {@link ExtractionResult}
*/
- private void processHREFElement(Node item, URI documentURI, ExtractionResult out) {
+ private void processHREFElement(Node item, IRI documentIRI, ExtractionResult out) {
Node rel = item.getAttributes().getNamedItem("rel");
if (rel == null) {
return;
@@ -239,7 +239,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
if (!isAbsoluteURL(href.getTextContent())) {
try {
absoluteURL = toAbsoluteURL(
- documentURI.toString(),
+ documentIRI.toString(),
href.getTextContent(),
'/'
);
@@ -269,16 +269,16 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
tokensWithNoDuplicates.add(relToken.toLowerCase());
}
for (String token : tokensWithNoDuplicates) {
- URI predicate;
+ IRI predicate;
if (isAbsoluteURL(token)) {
- predicate = RDFUtils.uri(token);
+ predicate = RDFUtils.iri(token);
} else {
- predicate = RDFUtils.uri(XHTML.NS + token);
+ predicate = RDFUtils.iri(XHTML.NS + token);
}
out.writeTriple(
- documentURI,
+ documentIRI,
predicate,
- RDFUtils.uri(absoluteURL.toString())
+ RDFUtils.iri(absoluteURL.toString())
);
}
}
@@ -288,10 +288,10 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* extraction algorithm.
*
* @param in {@link Document} to be processed.
- * @param documentURI Document current {@link URI}.
+ * @param documentIRI Document current {@link IRI}.
* @param out a valid not <code>null</code> {@link ExtractionResult}
*/
- private void processMetaElements(Document in, URI documentURI, ExtractionResult out) {
+ private void processMetaElements(Document in, IRI documentIRI, ExtractionResult out) {
NodeList metas = in.getElementsByTagName("meta");
for (int i = 0; i < metas.getLength(); i++) {
Node meta = metas.item(i);
@@ -300,10 +300,10 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
if (name != null && content != null) {
if (isAbsoluteURL(name)) {
processMetaElement(
- RDFUtils.uri(name),
+ RDFUtils.iri(name),
content,
getLanguage(meta),
- documentURI,
+ documentIRI,
out
);
} else {
@@ -311,7 +311,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
name,
content,
getLanguage(meta),
- documentURI,
+ documentIRI,
out
);
}
@@ -326,14 +326,14 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* @param uri
* @param content
* @param language
- * @param documentURI
+ * @param documentIRI
* @param out
*/
private void processMetaElement(
- URI uri,
+ IRI uri,
String content,
String language,
- URI documentURI,
+ IRI documentIRI,
ExtractionResult out
) {
if (content.contains(":")) {
@@ -348,7 +348,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
subject = RDFUtils.literal(content, language);
}
out.writeTriple(
- documentURI,
+ documentIRI,
uri,
subject
);
@@ -361,14 +361,14 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* @param name
* @param content
* @param language
- * @param documentURI
+ * @param documentIRI
* @param out
*/
private void processMetaElement(
String name,
String content,
String language,
- URI documentURI,
+ IRI documentIRI,
ExtractionResult out) {
Literal subject;
if (language == null) {
@@ -378,8 +378,8 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
subject = RDFUtils.literal(content, language);
}
out.writeTriple(
- documentURI,
- RDFUtils.uri(XHTML.NS + name.toLowerCase()),
+ documentIRI,
+ RDFUtils.iri(XHTML.NS + name.toLowerCase()),
subject
);
}
@@ -389,26 +389,26 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* extraction algorithm.
*
* @param in
- * @param documentURI
+ * @param documentIRI
* @param out
*/
- private void processCiteElements(Document in, URI documentURI, ExtractionResult out) {
+ private void processCiteElements(Document in, IRI documentIRI, ExtractionResult out) {
NodeList blockQuotes = in.getElementsByTagName("blockquote");
for (int i = 0; i < blockQuotes.getLength(); i++) {
- processCiteElement(blockQuotes.item(i), documentURI, out);
+ processCiteElement(blockQuotes.item(i), documentIRI, out);
}
NodeList quotes = in.getElementsByTagName("q");
for (int i = 0; i < quotes.getLength(); i++) {
- processCiteElement(quotes.item(i), documentURI, out);
+ processCiteElement(quotes.item(i), documentIRI, out);
}
}
- private void processCiteElement(Node item, URI documentURI, ExtractionResult out) {
+ private void processCiteElement(Node item, IRI documentIRI, ExtractionResult out) {
if (item.getAttributes().getNamedItem("cite") != null) {
out.writeTriple(
- documentURI,
+ documentIRI,
DCTerms.getInstance().source,
- RDFUtils.uri(item.getAttributes().getNamedItem("cite").getTextContent())
+ RDFUtils.iri(item.getAttributes().getNamedItem("cite").getTextContent())
);
}
}
@@ -419,7 +419,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
* extraction algorithm.
*
* @param itemScope
- * @param documentURI
+ * @param documentIRI
* @param out
* @param mappings
* @return
@@ -427,14 +427,14 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
*/
private Resource processType(
ItemScope itemScope,
- URI documentURI, ExtractionResult out,
+ IRI documentIRI, ExtractionResult out,
Map<ItemScope, Resource> mappings
) throws ExtractionException {
Resource subject;
if (mappings.containsKey(itemScope)) {
subject = mappings.get(itemScope);
} else if (isAbsoluteURL(itemScope.getItemId())) {
- subject = RDFUtils.uri(itemScope.getItemId());
+ subject = RDFUtils.iri(itemScope.getItemId());
} else {
subject = RDFUtils.getBNode(Integer.toString(itemScope.hashCode()));
}
@@ -445,7 +445,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
if (itemScope.getType() != null) {
String itemType;
itemType = itemScope.getType().toString();
- out.writeTriple(subject, RDF.TYPE, RDFUtils.uri(itemType));
+ out.writeTriple(subject, RDF.TYPE, RDFUtils.iri(itemType));
itemScopeType = itemScope.getType().toString();
}
for (String propName : itemScope.getProperties().keySet()) {
@@ -457,7 +457,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
propName,
itemProp,
itemScopeType,
- documentURI,
+ documentIRI,
mappings,
out
);
@@ -477,44 +477,39 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
String propName,
ItemProp itemProp,
String itemScopeType,
- URI documentURI,
+ IRI documentIRI,
Map<ItemScope, Resource> mappings,
ExtractionResult out
) throws MalformedURLException, ExtractionException {
- URI predicate;
+ IRI predicate;
if (!isAbsoluteURL(propName) && itemScopeType.equals("") && isStrict) {
return;
} else if (!isAbsoluteURL(propName) && itemScopeType.equals("") && !isStrict) {
- predicate = RDFUtils.uri(
- toAbsoluteURL(
- defaultNamespace,
- propName,
- '/'
- ).toString()
- );
+ predicate = RDFUtils.iri(toAbsoluteURL(
+ defaultNamespace,
+ propName,
+ '/'
+ ).toString());
} else {
- predicate = RDFUtils.uri(
- toAbsoluteURL(
- itemScopeType,
- propName,
- '/'
- ).toString());
+ predicate = RDFUtils.iri(toAbsoluteURL(
+ itemScopeType,
+ propName,
+ '/'
+ ).toString());
}
Value value;
Object propValue = itemProp.getValue().getContent();
ItemPropValue.Type propType = itemProp.getValue().getType();
if (propType.equals(ItemPropValue.Type.Nested)) {
- value = processType((ItemScope) propValue, documentURI, out, mappings);
+ value = processType((ItemScope) propValue, documentIRI, out, mappings);
} else if (propType.equals(ItemPropValue.Type.Plain)) {
value = RDFUtils.literal((String) propValue, documentLanguage);
} else if (propType.equals(ItemPropValue.Type.Link)) {
- value = RDFUtils.uri(
- toAbsoluteURL(
- documentURI.toString(),
- (String) propValue,
- '/'
- ).toString()
- );
+ value = RDFUtils.iri(toAbsoluteURL(
+ documentIRI.toString(),
+ (String) propValue,
+ '/'
+ ).toString());
} else if (propType.equals(ItemPropValue.Type.Date)) {
value = RDFUtils.literal(ItemPropValue.formatDateTime((Date) propValue), XMLSchema.DATE);
} else {
@@ -551,7 +546,7 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor {
private void notifyError(MicrodataParserException[] errors, ExtractionResult out) {
for(MicrodataParserException mpe : errors) {
out.notifyIssue(
- IssueReport.IssueLevel.Error,
+ IssueReport.IssueLevel.ERROR,
mpe.toJSON(),
mpe.getErrorLocationBeginRow(),
mpe.getErrorLocationBeginCol()
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java b/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java
index be01d3f..549cc1a 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/BaseRDFExtractor.java
@@ -23,11 +23,11 @@ import org.apache.any23.extractor.ExtractionParameters;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.Extractor;
import org.apache.any23.extractor.ExtractorDescription;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RioSetting;
-import org.openrdf.rio.helpers.BasicParserSettings;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RioSetting;
+import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
@@ -102,7 +102,7 @@ public abstract class BaseRDFExtractor implements Extractor.ContentExtractor {
parser.getParserConfig().addNonFatalError(BasicParserSettings.NORMALIZE_DATATYPE_VALUES);
//ByteBuffer seems to represent incorrect content. Need to make sure it is the content
//of the <script> node and not anything else!
- parser.parse(in, extractionContext.getDocumentURI().stringValue());
+ parser.parse(in, extractionContext.getDocumentIRI().stringValue());
} catch (RDFHandlerException ex) {
throw new IllegalStateException("Unexpected exception.", ex);
} catch (RDFParseException ex) {
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/JSONLDExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/JSONLDExtractor.java b/core/src/main/java/org/apache/any23/extractor/rdf/JSONLDExtractor.java
index 23a4d1e..96067b8 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/JSONLDExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/JSONLDExtractor.java
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.rdf;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
/**
* Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java b/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java
index 0fea1b2..39df467 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/NQuadsExtractor.java
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.rdf;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
/**
* Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java b/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java
index d49b18a..5fda9a2 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/NTriplesExtractor.java
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.rdf;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
/**
* Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java b/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java
index 9aaef80..016bb4e 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/RDFHandlerAdapter.java
@@ -18,11 +18,11 @@
package org.apache.any23.extractor.rdf;
import org.apache.any23.extractor.ExtractionResult;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.rio.RDFHandler;
-import org.openrdf.rio.RDFHandlerException;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.rio.RDFHandler;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
/**
* An RDFHandler that relays statements and prefix definitions to
@@ -49,8 +49,8 @@ public class RDFHandlerAdapter implements RDFHandler {
public void handleStatement(Statement stmt) {
if(stmt != null) {
final Resource context = stmt.getContext();
- if(context instanceof URI) {
- target.writeTriple(stmt.getSubject(), stmt.getPredicate(), stmt.getObject(), (URI) context);
+ if(context instanceof IRI) {
+ target.writeTriple(stmt.getSubject(), stmt.getPredicate(), stmt.getObject(), (IRI) context);
} else {
target.writeTriple(stmt.getSubject(), stmt.getPredicate(), stmt.getObject());
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java b/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
index 0ae85ec..94bdbc2 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
@@ -21,16 +21,16 @@ import org.apache.any23.extractor.IssueReport;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.rdf.Any23ValueFactoryWrapper;
-import org.openrdf.model.impl.ValueFactoryImpl;
-import org.openrdf.rio.ParseErrorListener;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.Rio;
-import org.openrdf.rio.helpers.RDFaParserSettings;
-import org.openrdf.rio.helpers.RDFaVersion;
-import org.openrdf.rio.turtle.TurtleParser;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.rio.ParseErrorListener;
+import org.eclipse.rdf4j.rio.RDFFormat;
+import org.eclipse.rdf4j.rio.RDFHandlerException;
+import org.eclipse.rdf4j.rio.RDFParseException;
+import org.eclipse.rdf4j.rio.RDFParser;
+import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.rio.helpers.RDFaParserSettings;
+import org.eclipse.rdf4j.rio.helpers.RDFaVersion;
+import org.eclipse.rdf4j.rio.turtle.TurtleParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -246,7 +246,7 @@ public class RDFParserFactory {
parser.setParseErrorListener( new InternalParseErrorListener(extractionResult) );
parser.setValueFactory(
new Any23ValueFactoryWrapper(
- ValueFactoryImpl.getInstance(),
+ SimpleValueFactory.getInstance(),
extractionResult,
extractionContext.getDefaultLanguage()
)
@@ -265,25 +265,28 @@ public class RDFParserFactory {
extractionResult = er;
}
- public void warning(String msg, int lineNo, int colNo) {
+ @Override
+ public void warning(String msg, long lineNo, long colNo) {
try {
- extractionResult.notifyIssue(IssueReport.IssueLevel.Warning, msg, lineNo, colNo);
+ extractionResult.notifyIssue(IssueReport.IssueLevel.WARNING, msg, lineNo, colNo);
} catch (Exception e) {
notifyExceptionInNotification(e);
}
}
- public void error(String msg, int lineNo, int colNo) {
+ @Override
+ public void error(String msg, long lineNo, long colNo) {
try {
- extractionResult.notifyIssue(IssueReport.IssueLevel.Error, msg, lineNo, colNo);
+ extractionResult.notifyIssue(IssueReport.IssueLevel.ERROR, msg, lineNo, colNo);
} catch (Exception e) {
notifyExceptionInNotification(e);
}
}
- public void fatalError(String msg, int lineNo, int colNo) {
+ @Override
+ public void fatalError(String msg, long lineNo, long colNo) {
try {
- extractionResult.notifyIssue(IssueReport.IssueLevel.Fatal, msg, lineNo, colNo);
+ extractionResult.notifyIssue(IssueReport.IssueLevel.FATAL, msg, lineNo, colNo);
} catch (Exception e) {
notifyExceptionInNotification(e);
}
@@ -297,22 +300,22 @@ public class RDFParserFactory {
}
/**
- * This extended Turtle parser sets the default namespace to the base URI
+ * This extended Turtle parser sets the default namespace to the base IRI
* before the parsing.
*/
private class ExtendedTurtleParser extends TurtleParser {
@Override
- public void parse(Reader reader, String baseURI)
+ public void parse(Reader reader, String baseIRI)
throws IOException, RDFParseException, RDFHandlerException {
- setNamespace("", baseURI);
- super.parse(reader, baseURI);
+ setNamespace("", baseIRI);
+ super.parse(reader, baseIRI);
}
@Override
- public void parse(InputStream in, String baseURI)
+ public void parse(InputStream in, String baseIRI)
throws IOException, RDFParseException, RDFHandlerException {
- setNamespace("", baseURI);
- super.parse(in, baseURI);
+ setNamespace("", baseIRI);
+ super.parse(in, baseIRI);
}
}
}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java b/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java
index 707e2fb..67fac7a 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/RDFXMLExtractor.java
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.rdf;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
/**
* Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java b/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java
index 10b2ff1..a3b9681 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/TriXExtractor.java
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.rdf;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
/**
* Concrete implementation of {@link org.apache.any23.extractor.Extractor.ContentExtractor}
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java b/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java
index 794ebc7..f4bcf5b 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/TurtleExtractor.java
@@ -20,7 +20,7 @@ package org.apache.any23.extractor.rdf;
import org.apache.any23.extractor.ExtractionContext;
import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
/**
*
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java b/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java
index 76d3fa3..037a362 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Extractor.java
@@ -22,7 +22,7 @@ import org.apache.any23.extractor.ExtractionResult;
import org.apache.any23.extractor.ExtractorDescription;
import org.apache.any23.extractor.rdf.BaseRDFExtractor;
import org.apache.any23.extractor.rdf.RDFParserFactory;
-import org.openrdf.rio.RDFParser;
+import org.eclipse.rdf4j.rio.RDFParser;
/**
* {@link org.apache.any23.extractor.Extractor} implementation for