You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2016/05/17 22:20:55 UTC
svn commit: r1744328 [2/24] - in /stanbol/trunk: ./
commons/indexedgraph/src/main/java/org/apache/stanbol/commons/indexedgraph/
commons/indexedgraph/src/test/java/org/apache/stanbol/commons/indexedgraph/
commons/installer/bundleprovider/src/main/java/o...
Added: stanbol/trunk/commons/indexedgraph/src/main/java/org/apache/stanbol/commons/indexedgraph/IndexedImmutableGraph.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/indexedgraph/src/main/java/org/apache/stanbol/commons/indexedgraph/IndexedImmutableGraph.java?rev=1744328&view=auto
==============================================================================
--- stanbol/trunk/commons/indexedgraph/src/main/java/org/apache/stanbol/commons/indexedgraph/IndexedImmutableGraph.java (added)
+++ stanbol/trunk/commons/indexedgraph/src/main/java/org/apache/stanbol/commons/indexedgraph/IndexedImmutableGraph.java Tue May 17 22:20:49 2016
@@ -0,0 +1,75 @@
+/*
+* 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.stanbol.commons.indexedgraph;
+
+import java.util.Iterator;
+
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.AbstractImmutableGraph;
+/**
+ * {@link ImmutableGraph} implementation that internally uses a {@link IndexedGraph}
+ * to hold the RDF graph.
+ * @author rwesten
+ *
+ */
+public class IndexedImmutableGraph extends AbstractImmutableGraph implements ImmutableGraph {
+
+ private final Graph tripleCollection;
+
+ /**
+ * Creates a graph with the triples in tripleCollection
+ *
+ * @param tripleCollection the collection of triples this ImmutableGraph shall consist of
+ */
+ public IndexedImmutableGraph(Graph tripleCollection) {
+ this.tripleCollection = new IndexedGraph(tripleCollection);
+ }
+
+ /**
+ * Create a graph with the triples provided by the Iterator
+ * @param tripleIter the iterator over the triples
+ */
+ public IndexedImmutableGraph(Iterator<Triple> tripleIter) {
+ this.tripleCollection = new IndexedGraph(tripleIter);
+ }
+// /**
+// * Create a read-only {@link public class IndexedImmutableGraph extends AbstractImmutableGraph implements ImmutableGraph {} wrapper over the provided
+// * {@link Graph}
+// * @param tripleCollection the indexed triple collection create a read-only
+// * wrapper around
+// */
+// protected IndexedGraph(IndexedGraph tripleCollection){
+// this.tripleCollection = tripleCollection;
+// }
+
+ @Override
+ protected Iterator<Triple> performFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return tripleCollection.filter(subject, predicate, object);
+ }
+
+
+ @Override
+ public int performSize() {
+ return tripleCollection.size();
+ }
+
+}
Modified: stanbol/trunk/commons/indexedgraph/src/test/java/org/apache/stanbol/commons/indexedgraph/IndexedGraphTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/indexedgraph/src/test/java/org/apache/stanbol/commons/indexedgraph/IndexedGraphTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/indexedgraph/src/test/java/org/apache/stanbol/commons/indexedgraph/IndexedGraphTest.java (original)
+++ stanbol/trunk/commons/indexedgraph/src/test/java/org/apache/stanbol/commons/indexedgraph/IndexedGraphTest.java Tue May 17 22:20:49 2016
@@ -27,20 +27,20 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.Language;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.core.test.MGraphTest;
+import org.apache.clerezza.rdf.core.test.GraphTest;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.RDFS;
@@ -49,13 +49,13 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class IndexedGraphTest extends MGraphTest {
+public class IndexedGraphTest extends GraphTest {
protected static final Logger log = LoggerFactory.getLogger(IndexedGraphTest.class);
- private UriRef uriRef1 = new UriRef("http://example.org/foo");
- private UriRef uriRef2 = new UriRef("http://example.org/bar");
- private UriRef uriRef3 = new UriRef("http://example.org/test");
+ private IRI uriRef1 = new IRI("http://example.org/foo");
+ private IRI uriRef2 = new IRI("http://example.org/bar");
+ private IRI uriRef3 = new IRI("http://example.org/test");
private Triple triple1 = new TripleImpl(uriRef1, uriRef2, uriRef3);
private Triple triple2 = new TripleImpl(uriRef2, uriRef2, uriRef1);
private Triple triple3 = new TripleImpl(uriRef3, uriRef1, uriRef3);
@@ -63,13 +63,13 @@ public class IndexedGraphTest extends M
private Triple triple5 = new TripleImpl(uriRef2, uriRef3, uriRef2);
@Override
- protected MGraph getEmptyMGraph() {
- return new IndexedMGraph();
+ protected Graph getEmptyGraph() {
+ return new IndexedGraph();
}
@Test
public void bNodeConsitency() {
- MGraph mGraph = getEmptyMGraph();
- final BNode bNode = new BNode() {
+ Graph mGraph = getEmptyGraph();
+ final BlankNode bNode = new BlankNode() {
@Override
public int hashCode() {
@@ -78,13 +78,13 @@ public class IndexedGraphTest extends M
@Override
public boolean equals(Object o) {
- return o instanceof BNode;
+ return o instanceof BlankNode;
}
};
- final BNode bNodeClone = new BNode() {
+ final BlankNode bNodeClone = new BlankNode() {
@Override
public int hashCode() {
@@ -93,7 +93,7 @@ public class IndexedGraphTest extends M
@Override
public boolean equals(Object o) {
- return o instanceof BNode;
+ return o instanceof BlankNode;
}
@@ -101,15 +101,15 @@ public class IndexedGraphTest extends M
mGraph.add(new TripleImpl(bNode, uriRef1, uriRef2));
mGraph.add(new TripleImpl(bNodeClone, uriRef2, uriRef3));
- NonLiteral bNodeBack = mGraph.filter(null, uriRef1, uriRef2).next().getSubject();
+ BlankNodeOrIRI bNodeBack = mGraph.filter(null, uriRef1, uriRef2).next().getSubject();
Assert.assertEquals("The bnode we get back is not equals to the one we added", bNode, bNodeBack);
- NonLiteral bNodeBack2 = mGraph.filter(null, uriRef2, uriRef3).next().getSubject();
+ BlankNodeOrIRI bNodeBack2 = mGraph.filter(null, uriRef2, uriRef3).next().getSubject();
Assert.assertEquals("The returnned bnodes are no longer equals", bNodeBack, bNodeBack2);
Assert.assertTrue("Not finding a triple when searching with equal bNode", mGraph.filter(bNodeBack, uriRef2, null).hasNext());
}
@Test
public void iteratorRemove() {
- TripleCollection itc = new IndexedTripleCollection();
+ Graph itc = new IndexedGraph();
itc.add(triple1);
itc.add(triple2);
itc.add(triple3);
@@ -125,13 +125,13 @@ public class IndexedGraphTest extends M
@Test
public void removeAll() {
- TripleCollection itc = new IndexedTripleCollection();
+ Graph itc = new IndexedGraph();
itc.add(triple1);
itc.add(triple2);
itc.add(triple3);
itc.add(triple4);
itc.add(triple5);
- TripleCollection itc2 = new IndexedTripleCollection();
+ Graph itc2 = new IndexedGraph();
itc2.add(triple1);
itc2.add(triple3);
itc2.add(triple5);
@@ -141,7 +141,7 @@ public class IndexedGraphTest extends M
@Test
public void filterIteratorRemove() {
- TripleCollection itc = new IndexedTripleCollection();
+ Graph itc = new IndexedGraph();
itc.add(triple1);
itc.add(triple2);
itc.add(triple3);
@@ -157,7 +157,7 @@ public class IndexedGraphTest extends M
@Test(expected=ConcurrentModificationException.class)
public void remove() {
- TripleCollection itc = new IndexedTripleCollection();
+ Graph itc = new IndexedGraph();
itc.add(triple1);
itc.add(triple2);
itc.add(triple3);
@@ -172,14 +172,14 @@ public class IndexedGraphTest extends M
}
/**
* Holds the test data to perform
- * {@link TripleCollection#filter(NonLiteral, UriRef, Resource)}
- * tests on {@link TripleCollection} implementations
+ * {@link Graph#filter(BlankNodeOrIRI, IRI, RDFTerm)}
+ * tests on {@link Graph} implementations
* @author rwesten
*/
public static final class TestCase {
- public final List<NonLiteral> subjects;
- public final List<Resource> objects;
- public final List<UriRef> predicates;
+ public final List<BlankNodeOrIRI> subjects;
+ public final List<RDFTerm> objects;
+ public final List<IRI> predicates;
/**
* Create a new Test with a maximum number of subjects, predicates and
@@ -189,10 +189,10 @@ public class IndexedGraphTest extends M
* @param pNum the maximum number of predicates
* @param oNum the maximum number of objects
*/
- public TestCase(TripleCollection tc,int sNum, int pNum, int oNum){
- Set<NonLiteral> subjects = new LinkedHashSet<NonLiteral>();
- Set<Resource> objects = new LinkedHashSet<Resource>();
- Set<UriRef> predicates = new LinkedHashSet<UriRef>();
+ public TestCase(Graph tc,int sNum, int pNum, int oNum){
+ Set<BlankNodeOrIRI> subjects = new LinkedHashSet<BlankNodeOrIRI>();
+ Set<RDFTerm> objects = new LinkedHashSet<RDFTerm>();
+ Set<IRI> predicates = new LinkedHashSet<IRI>();
for(Iterator<Triple> it = tc.iterator();it.hasNext();){
Triple t = it.next();
if(subjects.size() < 100){
@@ -206,11 +206,11 @@ public class IndexedGraphTest extends M
}
}
this.subjects = Collections.unmodifiableList(
- new ArrayList<NonLiteral>(subjects));
+ new ArrayList<BlankNodeOrIRI>(subjects));
this.predicates = Collections.unmodifiableList(
- new ArrayList<UriRef>(predicates));
+ new ArrayList<IRI>(predicates));
this.objects = Collections.unmodifiableList(
- new ArrayList<Resource>(objects));
+ new ArrayList<RDFTerm>(objects));
}
}
@Test
@@ -224,12 +224,12 @@ public class IndexedGraphTest extends M
createGraph(graph, graphsize, seed);
log.info("Load Time ({} triples)", graph.size());
long start = System.currentTimeMillis();
- MGraph sg = new SimpleMGraph(graph);
+ Graph sg = new SimpleGraph(graph);
log.info(" ... {}: {}",sg.getClass().getSimpleName(), System.currentTimeMillis()-start);
start = System.currentTimeMillis();
- MGraph ig = new IndexedMGraph(graph);
+ Graph ig = new IndexedGraph(graph);
log.info(" ... {}: {}",ig.getClass().getSimpleName(), System.currentTimeMillis()-start);
- //Simple Graph reference test
+ //Simple ImmutableGraph reference test
TestCase testCase = new TestCase(sg, 20, 5, 20); //reduced form 100,5,100
log.info("Filter Performance Test (graph size {} triples, iterations {})",graphsize,iterations);
log.info(" --- TEST {} with {} triples ---",sg.getClass().getSimpleName(),sg.size());
@@ -244,7 +244,7 @@ public class IndexedGraphTest extends M
Assert.assertEquals(sgr, igr); //validate filter implementation
}
- public List<Long> executeTest(TripleCollection graph, TestCase test, int testCount){
+ public List<Long> executeTest(Graph graph, TestCase test, int testCount){
List<Long> testResults = new ArrayList<Long>();
long start;
long resultCount;
@@ -286,7 +286,7 @@ public class IndexedGraphTest extends M
return testResults;
}
- private long testSPO(TripleCollection graph, TestCase test, int testCount) {
+ private long testSPO(Graph graph, TestCase test, int testCount) {
Iterator<Triple> it;
long count = 0;
int si = -1;
@@ -311,7 +311,7 @@ public class IndexedGraphTest extends M
return count;
}
- private long testSPn(TripleCollection graph, TestCase test, int testCount) {
+ private long testSPn(Graph graph, TestCase test, int testCount) {
Iterator<Triple> it;
long count = 0;
int si = -1;
@@ -331,7 +331,7 @@ public class IndexedGraphTest extends M
return count;
}
- private long testSnO(TripleCollection graph, TestCase test, int testCount) {
+ private long testSnO(Graph graph, TestCase test, int testCount) {
Iterator<Triple> it;
long count = 0;
int si = -1;
@@ -351,7 +351,7 @@ public class IndexedGraphTest extends M
return count;
}
- private long testnPO(TripleCollection graph, TestCase test, int testCount) {
+ private long testnPO(Graph graph, TestCase test, int testCount) {
Iterator<Triple> it;
long count = 0;
int pi = -1;
@@ -370,7 +370,7 @@ public class IndexedGraphTest extends M
}
return count;
}
- private long testSnn(TripleCollection graph, TestCase test, int testCount) {
+ private long testSnn(Graph graph, TestCase test, int testCount) {
Iterator<Triple> it;
long count = 0;
int si = 0;
@@ -384,7 +384,7 @@ public class IndexedGraphTest extends M
}
return count;
}
- private long testnPn(TripleCollection graph, TestCase test, int testCount) {
+ private long testnPn(Graph graph, TestCase test, int testCount) {
Iterator<Triple> it;
long count = 0;
int pi;
@@ -398,7 +398,7 @@ public class IndexedGraphTest extends M
}
return count;
}
- private long testnnO(TripleCollection graph, TestCase test, int testCount) {
+ private long testnnO(Graph graph, TestCase test, int testCount) {
Iterator<Triple> it;
long count = 0;
int oi;
@@ -426,9 +426,9 @@ public class IndexedGraphTest extends M
double b = 2.0;//bNode
double nb = b - (l * 2 / 3); //create new bNode
double random;
- NonLiteral subject = null;
- UriRef predicate = null;
- List<UriRef> predicateList = new ArrayList<UriRef>();
+ BlankNodeOrIRI subject = null;
+ IRI predicate = null;
+ List<IRI> predicateList = new ArrayList<IRI>();
predicateList.add(RDF.first);
predicateList.add(RDF.rest);
predicateList.add(RDF.type);
@@ -444,14 +444,14 @@ public class IndexedGraphTest extends M
String URI_PREFIX = "http://www.test.org/bigGraph/ref";
Language DE = new Language("de");
Language EN = new Language("en");
- Iterator<UriRef> predicates = predicateList.iterator();
- List<BNode> bNodes = new ArrayList<BNode>();
- bNodes.add(new BNode());
+ Iterator<IRI> predicates = predicateList.iterator();
+ List<BlankNode> bNodes = new ArrayList<BlankNode>();
+ bNodes.add(new BlankNode());
for (int count = 0; tc.size() < triples; count++) {
random = rnd.nextDouble() * 3;
if (random >= 2.5 || count == 0) {
if (random <= 2.75) {
- subject = new UriRef(URI_PREFIX + count);
+ subject = new IRI(URI_PREFIX + count);
} else {
int rndIndex = (int) ((random - 2.75) * bNodes.size() / (3.0 - 2.75));
subject = bNodes.get(rndIndex);
@@ -470,7 +470,7 @@ public class IndexedGraphTest extends M
} else if (random <= d) {
tc.add(new TripleImpl(subject, predicate, lf.createTypedLiteral(random)));
} else {
- PlainLiteral text;
+ Literal text;
if (random <= i) {
text = new PlainLiteralImpl("Literal for " + count);
} else if (random <= d) {
@@ -481,18 +481,18 @@ public class IndexedGraphTest extends M
tc.add(new TripleImpl(subject, predicate, text));
}
} else if (random <= b) { //bnode
- BNode bnode;
+ BlankNode bnode;
if (random <= nb) {
- bnode = new BNode();
+ bnode = new BlankNode();
bNodes.add(bnode);
} else { //>nb <b
int rndIndex = (int) ((random - nb) * bNodes.size() / (b - nb));
bnode = bNodes.get(rndIndex);
}
tc.add(new TripleImpl(subject, predicate, bnode));
- } else { //UriRef
+ } else { //IRI
tc.add(new TripleImpl(subject, predicate,
- new UriRef(URI_PREFIX + count * random)));
+ new IRI(URI_PREFIX + count * random)));
}
}
}
Modified: stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java (original)
+++ stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java Tue May 17 22:20:49 2016
@@ -217,7 +217,7 @@ public class BundleInstaller implements
while (resources.hasMoreElements()) {
URL url = resources.nextElement();
if(url != null){
- log.debug(" > installable Resource {}",url);
+ log.debug(" > installable RDFTerm {}",url);
InstallableResource resource = createInstallableResource(bundle, path, url);
if (resource != null) {
updated.add(resource);
Propchange: stanbol/trunk/commons/ixa-pipe-nerc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue May 17 22:20:49 2016
@@ -0,0 +1 @@
+target
Modified: stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaRDFParser.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaRDFParser.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaRDFParser.java (original)
+++ stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaRDFParser.java Tue May 17 22:20:49 2016
@@ -3,16 +3,14 @@ package org.apache.stanbol.commons.jsonl
import java.util.HashMap;
import java.util.Map;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.Language;
-import org.apache.clerezza.rdf.core.Literal;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import com.github.jsonldjava.core.JsonLdError;
import com.github.jsonldjava.core.JsonLdProcessor;
@@ -20,7 +18,7 @@ import com.github.jsonldjava.core.RDFDat
import com.github.jsonldjava.core.RDFParser;
/**
- * Converts a Clerezza {@link TripleCollection} to the {@link RDFDataset} used
+ * Converts a Clerezza {@link Graph} to the {@link RDFDataset} used
* by the {@link JsonLdProcessor}
*
* @author Rupert Westenthaler
@@ -35,10 +33,10 @@ public class ClerezzaRDFParser implement
@Override
public RDFDataset parse(Object input) throws JsonLdError {
count = 0;
- Map<BNode,String> bNodeMap = new HashMap<BNode,String>(1024);
+ Map<BlankNode,String> bNodeMap = new HashMap<BlankNode,String>(1024);
final RDFDataset result = new RDFDataset();
- if(input instanceof TripleCollection){
- for(Triple t : ((TripleCollection)input)){
+ if(input instanceof Graph){
+ for(Triple t : ((Graph)input)){
handleStatement(result,t, bNodeMap);
}
}
@@ -46,35 +44,27 @@ public class ClerezzaRDFParser implement
return result;
}
- private void handleStatement(RDFDataset result, Triple t, Map<BNode,String> bNodeMap) {
+ private void handleStatement(RDFDataset result, Triple t, Map<BlankNode,String> bNodeMap) {
final String subject = getResourceValue(t.getSubject(), bNodeMap);
final String predicate = getResourceValue(t.getPredicate(), bNodeMap);
- final Resource object = t.getObject();
+ final RDFTerm object = t.getObject();
if (object instanceof Literal) {
final String value = ((Literal)object).getLexicalForm();
final String language;
final String datatype;
- if(object instanceof TypedLiteral){
+ datatype = getResourceValue(((Literal)object).getDataType(), bNodeMap);
+ Language l = ((Literal)object).getLanguage();
+ if(l == null){
language = null;
- datatype = getResourceValue(((TypedLiteral)object).getDataType(), bNodeMap);
- } else if(object instanceof PlainLiteral){
- //we use RDF 1.1 literals so we do set the RDF_LANG_STRING datatype
- datatype = RDF_LANG_STRING;
- Language l = ((PlainLiteral)object).getLanguage();
- if(l == null){
- language = null;
- } else {
- language = l.toString();
- }
} else {
- throw new IllegalStateException("Unknown Literal class " + object.getClass().getName());
+ language = l.toString();
}
result.addTriple(subject, predicate, value, datatype, language);
count++;
} else {
- result.addTriple(subject, predicate, getResourceValue((NonLiteral) object, bNodeMap));
+ result.addTriple(subject, predicate, getResourceValue((BlankNodeOrIRI) object, bNodeMap));
count++;
}
@@ -88,20 +78,20 @@ public class ClerezzaRDFParser implement
return count;
}
- private String getResourceValue(NonLiteral nl, Map<BNode, String> bNodeMap) {
+ private String getResourceValue(BlankNodeOrIRI nl, Map<BlankNode, String> bNodeMap) {
if (nl == null) {
return null;
- } else if (nl instanceof UriRef) {
- return ((UriRef) nl).getUnicodeString();
- } else if (nl instanceof BNode) {
+ } else if (nl instanceof IRI) {
+ return ((IRI) nl).getUnicodeString();
+ } else if (nl instanceof BlankNode) {
String bNodeId = bNodeMap.get(nl);
if (bNodeId == null) {
bNodeId = Integer.toString(bNodeMap.size());
- bNodeMap.put((BNode) nl, bNodeId);
+ bNodeMap.put((BlankNode) nl, bNodeId);
}
return new StringBuilder("_:b").append(bNodeId).toString();
} else {
- throw new IllegalStateException("Unknwon NonLiteral type " + nl.getClass().getName() + "!");
+ throw new IllegalStateException("Unknwon BlankNodeOrIRI type " + nl.getClass().getName() + "!");
}
}
}
Added: stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaTripleCallback.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaTripleCallback.java?rev=1744328&view=auto
==============================================================================
--- stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaTripleCallback.java (added)
+++ stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/ClerezzaTripleCallback.java Tue May 17 22:20:49 2016
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2016 The Apache Software Foundation.
+ *
+ * Licensed 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.stanbol.commons.jsonld.clerezza;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
+
+import com.github.jsonldjava.core.JsonLdTripleCallback;
+import com.github.jsonldjava.core.RDFDataset;
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
+
+public class ClerezzaTripleCallback implements JsonLdTripleCallback {
+
+ private static final String RDF_LANG_STRING = "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString";
+
+ private Graph mGraph = new SimpleGraph();
+ private Map<String, BlankNode> bNodeMap = new HashMap<String, BlankNode>();
+
+ public void setGraph(Graph mGraph) {
+ this.mGraph = mGraph;
+ bNodeMap = new HashMap<String, BlankNode>();
+ }
+
+ public Graph getGraph() {
+ return mGraph;
+ }
+
+ private void triple(String s, String p, String o, String graph) {
+ if (s == null || p == null || o == null) {
+ // TODO: i don't know what to do here!!!!
+ return;
+ }
+
+ final BlankNodeOrIRI subject = getBlankNodeOrIRI(s);
+ final IRI predicate = new IRI(p);
+ final BlankNodeOrIRI object = getBlankNodeOrIRI(o);
+ mGraph.add(new TripleImpl(subject, predicate, object));
+ }
+
+ private void triple(String s, String p, String value, String datatype, String language,
+ String graph) {
+ final BlankNodeOrIRI subject = getBlankNodeOrIRI(s);
+ final IRI predicate = new IRI(p);
+ RDFTerm object;
+ if (language != null) {
+ object = new PlainLiteralImpl(value, new Language(language));
+ } else if (datatype == null || RDF_LANG_STRING.equals(datatype)) {
+ object = new PlainLiteralImpl(value);
+ } else {
+ object = new TypedLiteralImpl(value, new IRI(datatype));
+ }
+
+ mGraph.add(new TripleImpl(subject, predicate, object));
+ }
+
+ private BlankNodeOrIRI getBlankNodeOrIRI(String s) {
+ if (s.startsWith("_:")) {
+ return getBlankNode(s);
+ } else {
+ return new IRI(s);
+ }
+ }
+
+ private BlankNode getBlankNode(String s) {
+ if (bNodeMap.containsKey(s)) {
+ return bNodeMap.get(s);
+ } else {
+ final BlankNode result = new BlankNode();
+ bNodeMap.put(s, result);
+ return result;
+ }
+ }
+
+ @Override
+ public Object call(RDFDataset dataset) {
+ for (String graphName : dataset.graphNames()) {
+ final List<RDFDataset.Quad> quads = dataset.getQuads(graphName);
+ if ("@default".equals(graphName)) {
+ graphName = null;
+ }
+ for (final RDFDataset.Quad quad : quads) {
+ if (quad.getObject().isLiteral()) {
+ triple(quad.getSubject().getValue(), quad.getPredicate().getValue(), quad
+ .getObject().getValue(), quad.getObject().getDatatype(), quad
+ .getObject().getLanguage(), graphName);
+ } else {
+ triple(quad.getSubject().getValue(), quad.getPredicate().getValue(), quad
+ .getObject().getValue(), graphName);
+ }
+ }
+ }
+
+ return getGraph();
+ }
+
+}
Modified: stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdParsingProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdParsingProvider.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdParsingProvider.java (original)
+++ stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdParsingProvider.java Tue May 17 22:20:49 2016
@@ -19,8 +19,8 @@ package org.apache.stanbol.commons.jsonl
import java.io.IOException;
import java.io.InputStream;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.felix.scr.annotations.Component;
@@ -29,7 +29,6 @@ import org.apache.felix.scr.annotations.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.github.jsonldjava.clerezza.ClerezzaTripleCallback;
import com.github.jsonldjava.core.JsonLdError;
import com.github.jsonldjava.core.JsonLdProcessor;
import com.github.jsonldjava.utils.JsonUtils;
@@ -49,10 +48,10 @@ public class JsonLdParsingProvider imple
private final Logger logger = LoggerFactory.getLogger(getClass());
@Override
- public void parse(MGraph target, InputStream serializedGraph, String formatIdentifier, UriRef baseUri) {
- //The callback will add parsed triples to the target MGraph
+ public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
+ //The callback will add parsed triples to the target Graph
ClerezzaTripleCallback ctc = new ClerezzaTripleCallback();
- ctc.setMGraph(target);
+ ctc.setGraph(target);
Object input;
int startSize = 0;
if(logger.isDebugEnabled()){
Modified: stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdSerializingProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdSerializingProvider.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdSerializingProvider.java (original)
+++ stanbol/trunk/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/clerezza/JsonLdSerializingProvider.java Tue May 17 22:20:49 2016
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.felix.scr.annotations.Activate;
@@ -120,7 +120,7 @@ public class JsonLdSerializingProvider i
private boolean prettyPrint;
@Override
- public void serialize(OutputStream serializedGraph, TripleCollection tc, String formatIdentifier) {
+ public void serialize(OutputStream serializedGraph, Graph tc, String formatIdentifier) {
ClerezzaRDFParser serializer = new ClerezzaRDFParser();
try {
long start = System.currentTimeMillis();
Modified: stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java (original)
+++ stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java Tue May 17 22:20:49 2016
@@ -27,20 +27,17 @@ import java.util.Locale;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.locks.Lock;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.Language;
-import org.apache.clerezza.rdf.core.Literal;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
-import org.apache.clerezza.rdf.core.impl.TypedLiteralImpl;
import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.bidimap.DualHashBidiMap;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
@@ -50,17 +47,17 @@ import org.slf4j.LoggerFactory;
/**
* Clerezza based implementation of {@link RDFBackend} interface. This implementation uses the
- * {@link Resource} objects of Clerezza as processing unit RDFBackend.<p>
+ * {@link RDFTerm} objects of Clerezza as processing unit RDFBackend.<p>
*
- * For type conversions of {@link TypedLiteral}s the {@link LiteralFactory}
- * of Clerezza is used. In case parsed nodes are not {@link TypedLiteral} the
+ * For type conversions of {@link Literal}s the {@link LiteralFactory}
+ * of Clerezza is used. In case parsed nodes are not {@link Literal} the
* super implementations of {@link AbstractBackend} are called as such also
* support converting values based on the string representation.
*
* @author anil.sinaci
* @author Rupert Westenthaler
*/
-public class ClerezzaBackend extends AbstractBackend<Resource> implements RDFBackend<Resource> {
+public class ClerezzaBackend extends AbstractBackend<RDFTerm> implements RDFBackend<RDFTerm> {
private static final Logger logger = LoggerFactory.getLogger(ClerezzaBackend.class);
@@ -69,7 +66,7 @@ public class ClerezzaBackend extends Abs
* <li> local name
* <li> uri string
* <li> {@link URI}
- * <li> {@link UriRef}
+ * <li> {@link IRI}
* </ul>
* {@link #toString()} returns the uri.
*/
@@ -80,7 +77,7 @@ public class ClerezzaBackend extends Abs
String localName;
String uriString;
URI uri;
- UriRef uriRef;
+ IRI uriRef;
/**
* uses <code>{@link #name()}{@link String#toLowerCase() .toLoverCase()}
* </code> to generate the {@link #getLocalName()}
@@ -100,7 +97,7 @@ public class ClerezzaBackend extends Abs
this.localName = localName != null ? localName : name().toLowerCase();
this.uriString = namespace+this.localName;
this.uri = URI.create(uriString);
- this.uriRef = new UriRef(uriString);
+ this.uriRef = new IRI(uriString);
}
public String getLocalName(){
return localName;
@@ -111,65 +108,65 @@ public class ClerezzaBackend extends Abs
public URI getURI(){
return uri;
}
- public UriRef getUriRef(){
+ public IRI getIRI(){
return uriRef;
}
@Override
public String toString() {
return uriString;
}
- private static BidiMap xsdURI2UriRef = new DualHashBidiMap();
+ private static BidiMap xsdURI2IRI = new DualHashBidiMap();
static {
for(XSD type : XSD.values()){
- xsdURI2UriRef.put(type.getURI(), type.getUriRef());
+ xsdURI2IRI.put(type.getURI(), type.getIRI());
}
}
- public static URI getXsdURI(UriRef uri){
- return (URI)xsdURI2UriRef.getKey(uri);
+ public static URI getXsdURI(IRI uri){
+ return (URI)xsdURI2IRI.getKey(uri);
}
- public static UriRef getXsdUriRef(URI uri){
- return (UriRef)xsdURI2UriRef.get(uri);
+ public static IRI getXsdIRI(URI uri){
+ return (IRI)xsdURI2IRI.get(uri);
}
}
- private TripleCollection graph;
+ private Graph graph;
private static LiteralFactory lf = LiteralFactory.getInstance();
/**
* Allows sub-classes to create a instance and setting the {@link #graph}
- * later on by using {@link #setGraph(TripleCollection)}.
+ * later on by using {@link #setGraph(Graph)}.
*/
protected ClerezzaBackend() {
}
/**
- * Constructs a Clerezza {@link RDFBackend} by using the parsed {@link TripleCollection}
- * @param graph the {@link TripleCollection}
+ * Constructs a Clerezza {@link RDFBackend} by using the parsed {@link Graph}
+ * @param graph the {@link Graph}
* @throws IllegalArgumentException if <code>null</code> is parsed as graph.
*/
- public ClerezzaBackend(TripleCollection graph) {
+ public ClerezzaBackend(Graph graph) {
if(graph == null){
- throw new IllegalArgumentException("The parsed Graph MUST NOT be NULL!");
+ throw new IllegalArgumentException("The parsed ImmutableGraph MUST NOT be NULL!");
}
this.graph = graph;
}
- protected final TripleCollection getGraph(){
+ protected final Graph getGraph(){
return this.graph;
}
- protected final void setGraph(TripleCollection graph){
+ protected final void setGraph(Graph graph){
this.graph = graph;
}
@Override
- public Resource createLiteral(String content) {
+ public RDFTerm createLiteral(String content) {
return createLiteral(content,null,null);
}
@Override
- public Resource createLiteral(String content, Locale language, URI type) {
+ public RDFTerm createLiteral(String content, Locale language, URI type) {
logger.debug("creating literal with content \"{}\", language {}, datatype {}",
new Object[] {content, language, type});
if (type == null) {
@@ -179,38 +176,38 @@ public class ClerezzaBackend extends Abs
return new PlainLiteralImpl(content, new Language(language.getLanguage()));
}
} else {
- return new TypedLiteralImpl(content, XSD.getXsdUriRef(type));
+ return new TypedLiteralImpl(content, XSD.getXsdIRI(type));
}
}
@Override
- public Resource createURI(String uriref) {
- return new UriRef(uriref);
+ public RDFTerm createURI(String uriref) {
+ return new IRI(uriref);
}
@Override
- public Double doubleValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return LiteralFactory.getInstance().createObject(Double.class, (TypedLiteral) resource);
+ public Double doubleValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return LiteralFactory.getInstance().createObject(Double.class, (Literal) resource);
} else {
return super.doubleValue(resource);
}
}
@Override
- public Locale getLiteralLanguage(Resource resource) {
- if (resource instanceof PlainLiteral) {
- Language lang = ((PlainLiteral) resource).getLanguage();
+ public Locale getLiteralLanguage(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ Language lang = ((Literal) resource).getLanguage();
return lang != null ? new Locale(lang.toString()) : null;
} else {
- throw new IllegalArgumentException("Resource " + resource.toString() + " is not a PlainLiteral");
+ throw new IllegalArgumentException("RDFTerm " + resource.toString() + " is not a PlainLiteral");
}
}
@Override
- public URI getLiteralType(Resource resource) {
- if (resource instanceof TypedLiteral) {
- UriRef type = ((TypedLiteral) resource).getDataType();
+ public URI getLiteralType(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ IRI type = ((Literal) resource).getDataType();
return type != null ? XSD.getXsdURI(type) : null;
} else {
throw new IllegalArgumentException("Value " + resource.toString() + " is not a literal");
@@ -218,31 +215,31 @@ public class ClerezzaBackend extends Abs
}
@Override
- public boolean isBlank(Resource resource) {
- return resource instanceof BNode;
+ public boolean isBlank(RDFTerm resource) {
+ return resource instanceof BlankNode;
}
@Override
- public boolean isLiteral(Resource resource) {
+ public boolean isLiteral(RDFTerm resource) {
return resource instanceof Literal;
}
@Override
- public boolean isURI(Resource resource) {
- return resource instanceof UriRef;
+ public boolean isURI(RDFTerm resource) {
+ return resource instanceof IRI;
}
@Override
- public Collection<Resource> listObjects(Resource subject, Resource property) {
- if (!(property instanceof UriRef) ||
- !(subject instanceof NonLiteral)) {
+ public Collection<RDFTerm> listObjects(RDFTerm subject, RDFTerm property) {
+ if (!(property instanceof IRI) ||
+ !(subject instanceof BlankNodeOrIRI)) {
throw new IllegalArgumentException("Subject needs to be a URI or blank node, property a URI node");
}
- Collection<Resource> result = new ArrayList<Resource>();
+ Collection<RDFTerm> result = new ArrayList<RDFTerm>();
Lock readLock = readLockGraph();
try {
- Iterator<Triple> triples = graph.filter((NonLiteral) subject, (UriRef) property, null);
+ Iterator<Triple> triples = graph.filter((BlankNodeOrIRI) subject, (IRI) property, null);
while (triples.hasNext()) {
result.add(triples.next().getObject());
}
@@ -256,15 +253,15 @@ public class ClerezzaBackend extends Abs
}
@Override
- public Collection<Resource> listSubjects(Resource property, Resource object) {
- if (!(property instanceof UriRef)) {
+ public Collection<RDFTerm> listSubjects(RDFTerm property, RDFTerm object) {
+ if (!(property instanceof IRI)) {
throw new IllegalArgumentException("Property needs to be a URI node");
}
- Collection<Resource> result = new ArrayList<Resource>();
+ Collection<RDFTerm> result = new ArrayList<RDFTerm>();
Lock readLock = readLockGraph();
try {
- Iterator<Triple> triples = graph.filter(null, (UriRef) property, object);
+ Iterator<Triple> triples = graph.filter(null, (IRI) property, object);
while (triples.hasNext()) {
result.add(triples.next().getSubject());
}
@@ -277,90 +274,90 @@ public class ClerezzaBackend extends Abs
}
@Override
- public Long longValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(Long.class, (TypedLiteral) resource);
+ public Long longValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(Long.class, (Literal) resource);
} else {
return super.longValue(resource);
}
}
@Override
- public String stringValue(Resource resource) {
- if (resource instanceof UriRef) {
- return ((UriRef) resource).getUnicodeString();
+ public String stringValue(RDFTerm resource) {
+ if (resource instanceof IRI) {
+ return ((IRI) resource).getUnicodeString();
} else if (resource instanceof Literal) {
return ((Literal) resource).getLexicalForm();
- } else { //BNode
+ } else { //BlankNode
return resource.toString();
}
}
@Override
- public Boolean booleanValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(Boolean.class, (TypedLiteral) resource);
+ public Boolean booleanValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(Boolean.class, (Literal) resource);
} else {
return super.booleanValue(resource);
}
}
@Override
- public Date dateTimeValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(Date.class, (TypedLiteral) resource);
+ public Date dateTimeValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(Date.class, (Literal) resource);
} else {
return super.dateTimeValue(resource);
}
}
@Override
- public Date dateValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(Date.class, (TypedLiteral) resource);
+ public Date dateValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(Date.class, (Literal) resource);
} else {
return super.dateValue(resource);
}
}
@Override
- public Date timeValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(Date.class, (TypedLiteral) resource);
+ public Date timeValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(Date.class, (Literal) resource);
} else {
return super.timeValue(resource);
}
}
@Override
- public Float floatValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(Float.class, (TypedLiteral) resource);
+ public Float floatValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(Float.class, (Literal) resource);
} else {
return super.floatValue(resource);
}
}
@Override
- public Integer intValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(Integer.class, (TypedLiteral) resource);
+ public Integer intValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(Integer.class, (Literal) resource);
} else {
return super.intValue(resource);
}
}
@Override
- public BigInteger integerValue(Resource resource) {
- if (resource instanceof TypedLiteral) {
- return lf.createObject(BigInteger.class, (TypedLiteral) resource);
+ public BigInteger integerValue(RDFTerm resource) {
+ if (resource instanceof Literal) {
+ return lf.createObject(BigInteger.class, (Literal) resource);
} else {
return super.integerValue(resource);
}
}
@Override
- public BigDecimal decimalValue(Resource resource) {
+ public BigDecimal decimalValue(RDFTerm resource) {
//currently there is no converter for BigDecimal in clerezza
//so as a workaround use the lexical form (as provided by the super
//implementation
@@ -381,12 +378,8 @@ public class ClerezzaBackend extends Abs
*/
private Lock readLockGraph() {
final Lock readLock;
- if(graph instanceof LockableMGraph){
- readLock = ((LockableMGraph)graph).getLock().readLock();
- readLock.lock();
- } else {
- readLock = null;
- }
+ readLock = graph.getLock().readLock();
+ readLock.lock();
return readLock;
}
Modified: stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackendTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackendTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackendTest.java (original)
+++ stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackendTest.java Tue May 17 22:20:49 2016
@@ -39,16 +39,16 @@ import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
import org.apache.marmotta.ldpath.LDPath;
import org.apache.marmotta.ldpath.exception.LDPathParseException;
import org.apache.marmotta.ldpath.parser.Configuration;
-import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedGraph;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -74,17 +74,17 @@ public class ClerezzaBackendTest {
private static final String NS_SKOS = "http://www.w3.org/2004/02/skos/core#";
private static final String NS_DBP = "http://dbpedia.org/property/";
private static final String NS_DBO = "http://dbpedia.org/ontology/";
- //private static final UriRef SKOS_CONCEPT = new UriRef(NS_SKOS+"Concept");
+ //private static final IRI SKOS_CONCEPT = new IRI(NS_SKOS+"Concept");
- private static MGraph graph;
+ private static Graph graph;
private ClerezzaBackend backend;
- private LDPath<Resource> ldpath;
+ private LDPath<RDFTerm> ldpath;
@BeforeClass
public static void readTestData() throws IOException {
ParsingProvider parser = new JenaParserProvider();
//NOTE(rw): the new third parameter is the base URI used to resolve relative paths
- graph = new IndexedMGraph();
+ graph = new IndexedGraph();
InputStream in = ClerezzaBackendTest.class.getClassLoader().getResourceAsStream("testdata.rdf.zip");
assertNotNull(in);
ZipInputStream zipIn = new ZipInputStream(new BufferedInputStream(in));
@@ -106,36 +106,36 @@ public class ClerezzaBackendTest {
backend = new ClerezzaBackend(graph);
}
if(ldpath == null){
- Configuration<Resource> config = new Configuration<Resource>();
+ Configuration<RDFTerm> config = new Configuration<RDFTerm>();
config.addNamespace("dbp-prop", NS_DBP);
config.addNamespace("dbp-ont", NS_DBO);
- ldpath = new LDPath<Resource>(backend);
+ ldpath = new LDPath<RDFTerm>(backend);
}
}
@Test
public void testUriAndListImplemetnation() throws LDPathParseException {
- UriRef nationalChampionship = new UriRef("http://cv.iptc.org/newscodes/subjectcode/15073031");
+ IRI nationalChampionship = new IRI("http://cv.iptc.org/newscodes/subjectcode/15073031");
//this program tests:
- // * UriRef transformers
+ // * IRI transformers
// * #listSubjects(..) implementation
// * #listObjects(..) implementation
Map<String,Collection<?>> results = ldpath.programQuery(nationalChampionship,
getReader("skos:broaderTransitive = (skos:broaderTransitive | ^skos:narrowerTransitive)+;"));
- Set<Resource> expected = new HashSet<Resource>(Arrays.asList(
- new UriRef("http://cv.iptc.org/newscodes/subjectcode/15000000"),
- new UriRef("http://cv.iptc.org/newscodes/subjectcode/15073000")));
+ Set<RDFTerm> expected = new HashSet<RDFTerm>(Arrays.asList(
+ new IRI("http://cv.iptc.org/newscodes/subjectcode/15000000"),
+ new IRI("http://cv.iptc.org/newscodes/subjectcode/15073000")));
Collection<?> broaderTransitive = results.get(NS_SKOS+"broaderTransitive");
for(Object concept : broaderTransitive){
assertNotNull(concept);
- assertTrue(concept instanceof UriRef);
+ assertTrue(concept instanceof IRI);
assertTrue(expected.remove(concept));
}
assertTrue("missing: "+expected,expected.isEmpty());
}
@Test
public void testStringTransformer() throws LDPathParseException {
- UriRef nationalChampionship = new UriRef("http://cv.iptc.org/newscodes/subjectcode/15073031");
+ IRI nationalChampionship = new IRI("http://cv.iptc.org/newscodes/subjectcode/15073031");
Map<String,Collection<?>> results = ldpath.programQuery(nationalChampionship,
getReader("label = skos:prefLabel[@en-GB] :: xsd:string;"));
Set<String> expected = new HashSet<String>(Arrays.asList(
@@ -151,7 +151,7 @@ public class ClerezzaBackendTest {
}
@Test
public void testDataTypes() throws LDPathParseException {
- UriRef hallein = new UriRef("http://dbpedia.org/resource/Hallein");
+ IRI hallein = new IRI("http://dbpedia.org/resource/Hallein");
StringBuilder program = new StringBuilder();
program.append("@prefix dbp-prop : <").append(NS_DBP).append(">;");
Modified: stanbol/trunk/commons/ldpathtemplate/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/ldpathtemplate/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/ldpathtemplate/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java (original)
+++ stanbol/trunk/commons/ldpathtemplate/src/main/java/org/apache/stanbol/commons/ldpathtemplate/LdRenderer.java Tue May 17 22:20:49 2016
@@ -22,7 +22,7 @@ import freemarker.template.TemplateExcep
import java.io.IOException;
import java.io.Writer;
-import org.apache.clerezza.rdf.core.Resource;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -60,9 +60,9 @@ public class LdRenderer {
public void render(GraphNode node, final String templatePath, Writer out) {
//A GraphNode backend could be graph unspecific, so the same engine could be
//reused, possibly being signifantly more performant (caching, etc.)
- RDFBackend<Resource> backend = new ClerezzaBackend(node.getGraph());
- Resource context = node.getNode();
- TemplateEngine<Resource> engine = new TemplateEngine<Resource>(backend);
+ RDFBackend<RDFTerm> backend = new ClerezzaBackend(node.getGraph());
+ RDFTerm context = node.getNode();
+ TemplateEngine<RDFTerm> engine = new TemplateEngine<RDFTerm>(backend);
engine.setTemplateLoader(templateLoader);
try {
engine.processFileTemplate(context, templatePath, null, out);
Modified: stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/ClasspathDataFileProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/ClasspathDataFileProvider.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/ClasspathDataFileProvider.java (original)
+++ stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/ClasspathDataFileProvider.java Tue May 17 22:20:49 2016
@@ -71,7 +71,7 @@ public class ClasspathDataFileProvider i
final String resourcePath = RESOURCE_BASE_PATH + filename;
//final InputStream in = getClass().getClassLoader().getResourceAsStream(resourcePath);
URL dataFile = getClass().getClassLoader().getResource(resourcePath);
- //log.debug("Resource {} found: {}", (dataFile == null ? "NOT" : ""), resourcePath);
+ //log.debug("RDFTerm {} found: {}", (dataFile == null ? "NOT" : ""), resourcePath);
return dataFile;
}
@Override
Copied: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/OntologyLookaheadGraph.java (from r1744311, stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/OntologyLookaheadMGraph.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/OntologyLookaheadGraph.java?p2=stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/OntologyLookaheadGraph.java&p1=stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/OntologyLookaheadMGraph.java&r1=1744311&r2=1744328&rev=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/OntologyLookaheadMGraph.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/OntologyLookaheadGraph.java Tue May 17 22:20:49 2016
@@ -18,11 +18,11 @@ package org.apache.stanbol.commons.owl;
import java.util.Iterator;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.commons.owl.util.OWL2Constants;
@@ -35,27 +35,27 @@ import org.slf4j.LoggerFactory;
* @author alexdma
*
*/
-public class OntologyLookaheadMGraph extends SimpleMGraph {
+public class OntologyLookaheadGraph extends SimpleGraph {
private Logger log = LoggerFactory.getLogger(getClass());
- private UriRef ontologyIRI = null, versionIRI = null;
+ private IRI ontologyIRI = null, versionIRI = null;
private int tripleCount = 0, foundIndex = -1;
private int maxTriples, offset = 10;
- private UriRef versionIriProperty = new UriRef(OWL2Constants.OWL_VERSION_IRI);
+ private IRI versionIriProperty = new IRI(OWL2Constants.OWL_VERSION_IRI);
- public OntologyLookaheadMGraph() {
+ public OntologyLookaheadGraph() {
this(-1, -1);
}
- public OntologyLookaheadMGraph(int maxTriples) {
+ public OntologyLookaheadGraph(int maxTriples) {
this(maxTriples, Math.max(10, maxTriples / 10));
}
- public OntologyLookaheadMGraph(int maxTriples, int offset) {
+ public OntologyLookaheadGraph(int maxTriples, int offset) {
if (maxTriples > 0 && offset > maxTriples) throw new IllegalArgumentException(
"Offset cannot be greater than the maximum triples to scan.");
this.maxTriples = maxTriples;
@@ -64,9 +64,9 @@ public class OntologyLookaheadMGraph ext
protected void checkOntologyId() {
for (Iterator<Triple> it = this.filter(null, RDF.type, OWL.Ontology); it.hasNext();) {
- NonLiteral s = it.next().getSubject();
- if (s instanceof UriRef) {
- ontologyIRI = (UriRef) s;
+ BlankNodeOrIRI s = it.next().getSubject();
+ if (s instanceof IRI) {
+ ontologyIRI = (IRI) s;
if (foundIndex <= 0) foundIndex = tripleCount;
break;
}
@@ -75,9 +75,9 @@ public class OntologyLookaheadMGraph ext
* TODO be more tolerant with versionIRI triples with no owl:Ontology typing?
*/
for (Iterator<Triple> it = this.filter(null, versionIriProperty, null); it.hasNext();) {
- Resource o = it.next().getObject();
- if (o instanceof UriRef) {
- versionIRI = (UriRef) o;
+ RDFTerm o = it.next().getObject();
+ if (o instanceof IRI) {
+ versionIRI = (IRI) o;
if (foundIndex <= 0) foundIndex = tripleCount;
break;
}
@@ -94,7 +94,7 @@ public class OntologyLookaheadMGraph ext
return offset;
}
- public UriRef getOntologyIRI() {
+ public IRI getOntologyIRI() {
return ontologyIRI;
}
@@ -102,7 +102,7 @@ public class OntologyLookaheadMGraph ext
return tripleCount;
}
- public UriRef getVersionIRI() {
+ public IRI getVersionIRI() {
return versionIRI;
}
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java Tue May 17 22:20:49 2016
@@ -22,9 +22,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
@@ -40,9 +39,9 @@ import com.hp.hpl.jena.rdf.model.ModelFa
*
* <ul>
* <li> a Jena Model (see {@link Model}) to a list of Clerezza triples (see {@link Triple})
- * <li> a Jena Model to a Clerezza MGraph (see {@link MGraph})
- * <li> a Clerezza MGraph a Jena Model
- * <li> a Clerezza MGraph a Jena Graph (see {@link Graph}}
+ * <li> a Jena Model to a Clerezza Graph (see {@link Graph})
+ * <li> a Clerezza Graph a Jena Model
+ * <li> a Clerezza Graph a Jena ImmutableGraph (see {@link ImmutableGraph}}
* </ul>
*
*
@@ -68,7 +67,7 @@ public final class JenaToClerezzaConvert
ArrayList<Triple> clerezzaTriples = new ArrayList<Triple>();
- MGraph mGraph = jenaModelToClerezzaMGraph(model);
+ org.apache.clerezza.commons.rdf.Graph mGraph = jenaModelToClerezzaGraph(model);
Iterator<Triple> tripleIterator = mGraph.iterator();
while(tripleIterator.hasNext()){
@@ -82,13 +81,13 @@ public final class JenaToClerezzaConvert
/**
*
- * Converts a Jena {@link Model} to Clerezza {@link MGraph}.
+ * Converts a Jena {@link Model} to Clerezza {@link Graph}.
*
* @param model {@link Model}
- * @return the equivalent Clerezza {@link MGraph}.
+ * @return the equivalent Clerezza {@link Graph}.
*/
- public static MGraph jenaModelToClerezzaMGraph(Model model){
+ public static org.apache.clerezza.commons.rdf.Graph jenaModelToClerezzaGraph(Model model){
ByteArrayOutputStream out = new ByteArrayOutputStream();
model.write(out);
@@ -97,7 +96,7 @@ public final class JenaToClerezzaConvert
ParsingProvider parser = new JenaParserProvider();
- MGraph mGraph = new SimpleMGraph();
+ org.apache.clerezza.commons.rdf.Graph mGraph = new SimpleGraph();
parser.parse(mGraph,in, SupportedFormat.RDF_XML, null);
return mGraph;
@@ -106,12 +105,12 @@ public final class JenaToClerezzaConvert
/**
- * Converts a Clerezza {@link MGraph} to a Jena {@link Model}.
+ * Converts a Clerezza {@link Graph} to a Jena {@link Model}.
*
- * @param mGraph {@link MGraph}
+ * @param mGraph {@link Graph}
* @return the equivalent Jena {@link Model}.
*/
- public static Model clerezzaMGraphToJenaModel(MGraph mGraph){
+ public static Model clerezzaGraphToJenaModel(org.apache.clerezza.commons.rdf.Graph mGraph){
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -131,14 +130,14 @@ public final class JenaToClerezzaConvert
/**
- * Converts a Clerezza {@link MGraph} to a Jena {@link Graph}.
+ * Converts a Clerezza {@link Graph} to a Jena {@link ImmutableGraph}.
*
- * @param mGraph {@link MGraph}
- * @return the equivalent Jena {@link Graph}.
+ * @param mGraph {@link Graph}
+ * @return the equivalent Jena {@link ImmutableGraph}.
*/
- public static com.hp.hpl.jena.graph.Graph clerezzaMGraphToJenaGraph(MGraph mGraph){
+ public static com.hp.hpl.jena.graph.Graph clerezzaGraphToJenaGraph(org.apache.clerezza.commons.rdf.Graph mGraph){
- Model jenaModel = clerezzaMGraphToJenaModel(mGraph);
+ Model jenaModel = clerezzaGraphToJenaModel(mGraph);
if(jenaModel != null){
return jenaModel.getGraph();
}
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java Tue May 17 22:20:49 2016
@@ -23,10 +23,9 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
@@ -52,9 +51,9 @@ import com.hp.hpl.jena.rdf.model.Model;
*
* <ul>
* <li>a Jena Model (see {@link Model}) to a list of Clerezza triples (see {@link Triple})
- * <li>a Jena Model to a Clerezza MGraph (see {@link MGraph})
- * <li>a Clerezza MGraph a Jena Model
- * <li>a Clerezza MGraph a Jena Graph (see {@link Graph}
+ * <li>a Jena Model to a Clerezza Graph (see {@link Graph})
+ * <li>a Clerezza Graph a Jena Model
+ * <li>a Clerezza Graph a Jena ImmutableGraph (see {@link ImmutableGraph}
* </ul>
*
*
@@ -82,7 +81,7 @@ public final class OWLAPIToClerezzaConve
*/
public static List<Triple> owlOntologyToClerezzaTriples(OWLOntology ontology) {
ArrayList<Triple> clerezzaTriples = new ArrayList<Triple>();
- TripleCollection mGraph = owlOntologyToClerezzaMGraph(ontology);
+ org.apache.clerezza.commons.rdf.Graph mGraph = owlOntologyToClerezzaGraph(ontology);
Iterator<Triple> tripleIterator = mGraph.iterator();
while (tripleIterator.hasNext()) {
Triple triple = tripleIterator.next();
@@ -93,22 +92,22 @@ public final class OWLAPIToClerezzaConve
/**
*
- * Converts a OWL API {@link OWLOntology} to Clerezza {@link MGraph}.
+ * Converts a OWL API {@link OWLOntology} to Clerezza {@link Graph}.
*
* @param ontology
* {@link OWLOntology}
- * @return the equivalent Clerezza {@link MGraph}.
+ * @return the equivalent Clerezza {@link Graph}.
*/
- public static TripleCollection owlOntologyToClerezzaMGraph(OWLOntology ontology) {
- MGraph mGraph = null;
+ public static org.apache.clerezza.commons.rdf.Graph owlOntologyToClerezzaGraph(OWLOntology ontology) {
+ org.apache.clerezza.commons.rdf.Graph mGraph = null;
ByteArrayOutputStream out = new ByteArrayOutputStream();
OWLOntologyManager manager = ontology.getOWLOntologyManager();
try {
manager.saveOntology(ontology, new RDFXMLOntologyFormat(), out);
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
ParsingProvider parser = new JenaParserProvider();
- mGraph = new SimpleMGraph();
+ mGraph = new SimpleGraph();
parser.parse(mGraph, in, SupportedFormat.RDF_XML, null);
} catch (OWLOntologyStorageException e) {
log.error("Failed to serialize OWL Ontology " + ontology + "for conversion", e);
@@ -118,20 +117,20 @@ public final class OWLAPIToClerezzaConve
}
/**
- * Converts a Clerezza {@link MGraph} to an OWL API {@link OWLOntology}.
+ * Converts a Clerezza {@link Graph} to an OWL API {@link OWLOntology}.
*
* @param mGraph
- * {@link MGraph}
+ * {@link org.apache.clerezza.commons.rdf.Graph}
* @return the equivalent OWL API {@link OWLOntology}.
*/
- public static OWLOntology clerezzaGraphToOWLOntology(TripleCollection graph) {
+ public static OWLOntology clerezzaGraphToOWLOntology(org.apache.clerezza.commons.rdf.Graph graph) {
OWLOntologyManager mgr = OWLManager.createOWLOntologyManager();
// Never try to import
mgr.addIRIMapper(new PhonyIRIMapper(Collections.<IRI> emptySet()));
return clerezzaGraphToOWLOntology(graph, mgr);
}
- public static OWLOntology clerezzaGraphToOWLOntology(TripleCollection graph,
+ public static OWLOntology clerezzaGraphToOWLOntology(org.apache.clerezza.commons.rdf.Graph graph,
OWLOntologyManager ontologyManager) {
/*
@@ -145,7 +144,7 @@ public final class OWLAPIToClerezzaConve
* Alternatively, construct the whole reverse imports stack, then traverse it again, get the
* OWLOntology version for each (with the phony mapper set) and add it to the merge pool
*
- * If it works, just add all the triples to a TripleCollection, but no, we don't want to store that
+ * If it works, just add all the triples to a Graph, but no, we don't want to store that
* change.
*/
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/OWLUtils.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/OWLUtils.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/OWLUtils.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/OWLUtils.java Tue May 17 22:20:49 2016
@@ -21,14 +21,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.stanbol.commons.owl.OntologyLookaheadMGraph;
+import org.apache.stanbol.commons.owl.OntologyLookaheadGraph;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyID;
@@ -83,20 +82,20 @@ public final class OWLUtils {
* the RDF graph
* @return the OWL ontology ID of the supplied graph, or null if it denotes an anonymous ontology.
*/
- public static OWLOntologyID extractOntologyID(TripleCollection graph) {
+ public static OWLOntologyID extractOntologyID(Graph graph) {
IRI ontologyIri = null, versionIri = null;
Iterator<Triple> it = graph.filter(null, RDF.type, OWL.Ontology);
if (it.hasNext()) {
- NonLiteral subj = it.next().getSubject();
+ BlankNodeOrIRI subj = it.next().getSubject();
if (it.hasNext()) {
log.warn("Multiple OWL ontology definitions found.");
log.warn("Ignoring all but {}", subj);
}
- if (subj instanceof UriRef) {
- ontologyIri = IRI.create(((UriRef) subj).getUnicodeString());
- Iterator<Triple> it2 = graph.filter(subj, new UriRef(OWL2Constants.OWL_VERSION_IRI),
+ if (subj instanceof org.apache.clerezza.commons.rdf.IRI) {
+ ontologyIri = IRI.create(((org.apache.clerezza.commons.rdf.IRI) subj).getUnicodeString());
+ Iterator<Triple> it2 = graph.filter(subj, new org.apache.clerezza.commons.rdf.IRI(OWL2Constants.OWL_VERSION_IRI),
null);
- if (it2.hasNext()) versionIri = IRI.create(((UriRef) it2.next().getObject())
+ if (it2.hasNext()) versionIri = IRI.create(((org.apache.clerezza.commons.rdf.IRI) it2.next().getObject())
.getUnicodeString());
}
}
@@ -136,7 +135,7 @@ public final class OWLUtils {
versionIriOffset);
BufferedInputStream bIn = new BufferedInputStream(content);
bIn.mark(limit * 512); // set an appropriate limit
- OntologyLookaheadMGraph graph = new OntologyLookaheadMGraph(limit, versionIriOffset);
+ OntologyLookaheadGraph graph = new OntologyLookaheadGraph(limit, versionIriOffset);
try {
parser.parse(graph, bIn, format);
} catch (RuntimeException e) {
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/URIUtils.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/URIUtils.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/URIUtils.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/util/URIUtils.java Tue May 17 22:20:49 2016
@@ -18,7 +18,6 @@ package org.apache.stanbol.commons.owl.u
import java.net.URI;
-import org.apache.clerezza.rdf.core.UriRef;
import org.semanticweb.owlapi.model.IRI;
/**
@@ -35,25 +34,25 @@ public final class URIUtils {
private URIUtils() {}
/**
- * Converts a UriRef to an IRI.
+ * Converts a IRI to an IRI.
*
* @param uri
- * the UriRef to convert
- * @return the IRI form of the UriRef
+ * the IRI to convert
+ * @return the IRI form of the IRI
*/
- public static IRI createIRI(UriRef uri) {
+ public static IRI createIRI(org.apache.clerezza.commons.rdf.IRI uri) {
return IRI.create(uri.getUnicodeString());
}
/**
- * Converts an IRI to a UriRef.
+ * Converts an IRI to a IRI.
*
* @param uri
* the IRI to convert
- * @return the UriRef form of the IRI
+ * @return the IRI form of the IRI
*/
- public static UriRef createUriRef(IRI uri) {
- return new UriRef(uri.toString());
+ public static org.apache.clerezza.commons.rdf.IRI createIRI(IRI uri) {
+ return new org.apache.clerezza.commons.rdf.IRI(uri.toString());
}
/**
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLOntologyWriter.java Tue May 17 22:20:49 2016
@@ -50,7 +50,7 @@ import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
@@ -134,7 +134,7 @@ public class OWLOntologyWriter implement
// Non-native formats that require a conversion to Clerezza
if (RDF_JSON_TYPE.equals(mediaType) || N3_TYPE.equals(mediaType)
|| TEXT_PLAIN.equals(mediaType.toString()) || N_TRIPLE_TYPE.equals(mediaType)) {
- TripleCollection mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(ontology);
+ Graph mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaGraph(ontology);
SerializingProvider serializer = null;
if (RDF_JSON_TYPE.equals(mediaType)) serializer = new RdfJsonSerializingProvider();
else if (N3_TYPE.equals(mediaType) || N_TRIPLE_TYPE.equals(mediaType)
Modified: stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverterTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverterTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverterTest.java (original)
+++ stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverterTest.java Tue May 17 22:20:49 2016
@@ -19,19 +19,18 @@ package org.apache.stanbol.commons.owl.t
import java.util.Collection;
import java.util.Iterator;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.stanbol.commons.owl.transformation.JenaToClerezzaConverter;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property;
@@ -52,7 +51,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
public class JenaToClerezzaConverterTest {
private static Model model;
- private static MGraph mGraph;
+ private static Graph mGraph;
private static String ns = "http://incubator.apache.org/stanbol/owl#";
private static String foaf = "http://xmlns.com/foaf/0.1/";
@@ -85,14 +84,14 @@ public class JenaToClerezzaConverterTest
* EnricoDaga isA Person
* AndreaNuzzolese knows EnricoDaga
*/
- mGraph = new SimpleMGraph();
+ mGraph = new SimpleGraph();
- UriRef knowsInClerezza = new UriRef(ns+"knows");
- UriRef rdfType = new UriRef(RDF.getURI()+"type");
- UriRef foafPersonInClerezza = new UriRef(foaf+"Person");
+ IRI knowsInClerezza = new IRI(ns+"knows");
+ IRI rdfType = new IRI(RDF.getURI()+"type");
+ IRI foafPersonInClerezza = new IRI(foaf+"Person");
- NonLiteral andreaNuzzoleseInClerezza = new UriRef(ns+"AndreaNuzzolese");
- NonLiteral enricoDagaInClerezza = new UriRef(ns+"EnricoDaga");
+ BlankNodeOrIRI andreaNuzzoleseInClerezza = new IRI(ns+"AndreaNuzzolese");
+ BlankNodeOrIRI enricoDagaInClerezza = new IRI(ns+"EnricoDaga");
Triple triple = new TripleImpl(andreaNuzzoleseInClerezza, rdfType, foafPersonInClerezza);
mGraph.add(triple);
@@ -105,14 +104,14 @@ public class JenaToClerezzaConverterTest
}
@Test
- public void testMGraphToJenaGraph(){
+ public void testGraphToJenaGraph(){
/*
- * Convert the MGraph to a Jena Graph.
+ * Convert the Graph to a Jena ImmutableGraph.
*/
- Graph jGraph = JenaToClerezzaConverter.clerezzaMGraphToJenaGraph(mGraph);
+ com.hp.hpl.jena.graph.Graph jGraph = JenaToClerezzaConverter.clerezzaGraphToJenaGraph(mGraph);
/*
- * Print all the triples contained in the Jena Graph.
+ * Print all the triples contained in the Jena ImmutableGraph.
*/
ExtendedIterator<com.hp.hpl.jena.graph.Triple> tripleIt = jGraph.find(null, null, null);
while(tripleIt.hasNext()){
@@ -122,11 +121,11 @@ public class JenaToClerezzaConverterTest
}
@Test
- public void testMGraphToJenaModel(){
+ public void testGraphToJenaModel(){
/*
- * Convert the MGraph to a Jena Model.
+ * Convert the Graph to a Jena Model.
*/
- Model model = JenaToClerezzaConverter.clerezzaMGraphToJenaModel(mGraph);
+ Model model = JenaToClerezzaConverter.clerezzaGraphToJenaModel(mGraph);
/*
* Print all the triples contained in the Jena Model.
@@ -140,14 +139,14 @@ public class JenaToClerezzaConverterTest
}
@Test
- public void testModelToMGraph(){
+ public void testModelToGraph(){
/*
- * Convert the Jena Model to a Clerezza MGraph.
+ * Convert the Jena Model to a Clerezza Graph.
*/
- MGraph mGraph = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(model);
+ Graph mGraph = JenaToClerezzaConverter.jenaModelToClerezzaGraph(model);
/*
- * Print all the triples contained in the Clerezza MGraph.
+ * Print all the triples contained in the Clerezza Graph.
*/
Iterator<Triple> tripleIt = mGraph.iterator();
while(tripleIt.hasNext()){