Modified: stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/SurfaceForm.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/SurfaceForm.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/SurfaceForm.java (original) +++ stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/SurfaceForm.java Tue May 17 22:20:49 2016 @@ -28,7 +28,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -//import org.apache.clerezza.rdf.core.Resource; +//import org.apache.clerezza.commons.rdf.RDFTerm; /** * Stores the surface forms given by DBPedia Spotlight Candidates.
Modified: stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java (original) +++ stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java Tue May 17 22:20:49 2016 @@ -37,10 +37,10 @@ import java.util.Dictionary; import java.util.HashMap; import java.util.Map; -import org.apache.clerezza.rdf.core.Language; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +import org.apache.clerezza.commons.rdf.Language; +import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.commons.rdf.IRI; +import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.commons.io.IOUtils; import org.apache.felix.scr.annotations.Component; @@ -201,11 +201,11 @@ public class DBPSpotlightSpotEnhancement protected void createEnhancements(Collection<SurfaceForm> occs, ContentItem ci, String content, Language lang) { - HashMap<String, UriRef> entityAnnotationMap = new HashMap<String, UriRef>(); + HashMap<String, IRI> entityAnnotationMap = new HashMap<String, IRI>(); - MGraph model = ci.getMetadata(); + Graph model = ci.getMetadata(); for (SurfaceForm occ : occs) { - UriRef textAnnotation = SpotlightEngineUtils.createTextEnhancement( + IRI textAnnotation = SpotlightEngineUtils.createTextEnhancement( occ, this, ci, content, lang); if (entityAnnotationMap.containsKey(occ.name)) { model.add(new TripleImpl(entityAnnotationMap.get(occ.name), @@ -228,7 +228,7 @@ public class DBPSpotlightSpotEnhancement * @throws EngineException * if the request cannot be sent */ - protected Collection<SurfaceForm> doPostRequest(String text,UriRef contentItemUri) + protected Collection<SurfaceForm> doPostRequest(String text,IRI contentItemUri) throws EngineException { //rwesten: reimplemented this so that the request // is directly written to the request instead Modified: stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java (original) +++ stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java Tue May 17 22:20:49 2016 @@ -45,13 +45,13 @@ import java.text.NumberFormat; import java.util.Dictionary; import java.util.Map.Entry; -import org.apache.clerezza.rdf.core.Language; -import org.apache.clerezza.rdf.core.Literal; +import org.apache.clerezza.commons.rdf.Language; +import org.apache.clerezza.commons.rdf.Literal; import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +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.TripleImpl; import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants; import org.apache.stanbol.enhancer.engines.dbpspotlight.model.Annotation; import org.apache.stanbol.enhancer.engines.dbpspotlight.model.CandidateResource; @@ -116,7 +116,7 @@ public final class SpotlightEngineUtils } public static String getPlainContent(ContentItem ci) throws EngineException { - Entry<UriRef, Blob> contentPart = ContentItemHelper.getBlob(ci, + Entry<IRI, Blob> contentPart = ContentItemHelper.getBlob(ci, SUPPORTED_MIMTYPES); if (contentPart == null) { throw new IllegalStateException( @@ -203,11 +203,11 @@ public final class SpotlightEngineUtils * @param lang the language of the content or <code>null</code> * @return the URI of the created fise:TextAnnotation */ - public static UriRef createTextEnhancement(SurfaceForm occ, + public static IRI createTextEnhancement(SurfaceForm occ, EnhancementEngine engine, ContentItem ci, String content, Language lang) { - MGraph model = ci.getMetadata(); - UriRef textAnnotation = EnhancementEngineHelper + Graph model = ci.getMetadata(); + IRI textAnnotation = EnhancementEngineHelper .createTextEnhancement(ci, engine); model.add(new TripleImpl(textAnnotation, ENHANCER_SELECTED_TEXT, new PlainLiteralImpl(occ.name, lang))); @@ -217,7 +217,7 @@ public final class SpotlightEngineUtils literalFactory.createTypedLiteral(occ.offset + occ.name.length()))); if(occ.type != null && !occ.type.isEmpty()){ - model.add(new TripleImpl(textAnnotation, DC_TYPE, new UriRef( + model.add(new TripleImpl(textAnnotation, DC_TYPE, new IRI( occ.type))); } model.add(new TripleImpl(textAnnotation, ENHANCER_SELECTION_CONTEXT, @@ -237,11 +237,11 @@ public final class SpotlightEngineUtils * created fise:EntityAnnotation * @return the URI of the created fise:TextAnnotation */ - public static UriRef createEntityAnnotation(CandidateResource resource, - EnhancementEngine engine, ContentItem ci, UriRef textAnnotation) { - UriRef entityAnnotation = EnhancementEngineHelper + public static IRI createEntityAnnotation(CandidateResource resource, + EnhancementEngine engine, ContentItem ci, IRI textAnnotation) { + IRI entityAnnotation = EnhancementEngineHelper .createEntityEnhancement(ci, engine); - MGraph model = ci.getMetadata(); + Graph model = ci.getMetadata(); Literal label = new PlainLiteralImpl(resource.label, new Language("en")); model.add(new TripleImpl(entityAnnotation, DC_RELATION, @@ -276,9 +276,9 @@ public final class SpotlightEngineUtils */ public static void createEntityAnnotation(Annotation annotation, EnhancementEngine engine, ContentItem ci, - UriRef textAnnotation, Language language) { - MGraph model = ci.getMetadata(); - UriRef entityAnnotation = EnhancementEngineHelper + IRI textAnnotation, Language language) { + Graph model = ci.getMetadata(); + IRI entityAnnotation = EnhancementEngineHelper .createEntityEnhancement(ci, engine); Literal label = new PlainLiteralImpl(annotation.surfaceForm.name, language); @@ -290,7 +290,7 @@ public final class SpotlightEngineUtils ENHANCER_ENTITY_REFERENCE, annotation.uri)); //set the fise:entity-type for(String type : annotation.getTypeNames()){ - UriRef annotationType = new UriRef(type); + IRI annotationType = new IRI(type); model.add(new TripleImpl(entityAnnotation, ENHANCER_ENTITY_TYPE, annotationType)); } Modified: stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java (original) +++ stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java Tue May 17 22:20:49 2016 @@ -28,10 +28,10 @@ import java.util.HashMap; import java.util.Map.Entry; import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.Resource; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +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.TripleImpl; import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory; import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants; import org.apache.stanbol.enhancer.engines.dbpspotlight.TestDefaults; @@ -77,7 +77,7 @@ public class DBPSpotlightAnnotateEnhance private static ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance(); private ContentItem ci; - private static Entry<UriRef, Blob> textContentPart; + private static Entry<IRI, Blob> textContentPart; @BeforeClass public static void oneTimeSetup() throws Exception { @@ -126,7 +126,7 @@ public class DBPSpotlightAnnotateEnhance } catch (EngineException e) { RemoteServiceHelper.checkServiceUnavailable(e); } - HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>(); + HashMap<IRI,RDFTerm> expectedValues = new HashMap<IRI,RDFTerm>(); expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri()); expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral( dbpslight.getClass().getName())); Modified: stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java (original) +++ stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java Tue May 17 22:20:49 2016 @@ -28,10 +28,10 @@ import java.util.HashMap; import java.util.Map.Entry; import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.Resource; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +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.TripleImpl; import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory; import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants; import org.apache.stanbol.enhancer.engines.dbpspotlight.TestDefaults; @@ -76,7 +76,7 @@ public class DBPSpotlightCandidatesEnhan private static ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance(); private ContentItem ci; - private static Entry<UriRef, Blob> textContentPart; + private static Entry<IRI, Blob> textContentPart; @BeforeClass public static void oneTimeSetup() throws Exception { @@ -126,7 +126,7 @@ public class DBPSpotlightCandidatesEnhan RemoteServiceHelper.checkServiceUnavailable(e); return; } - HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>(); + HashMap<IRI,RDFTerm> expectedValues = new HashMap<IRI,RDFTerm>(); expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri()); expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral( dbpslight.getClass().getName())); Modified: stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java (original) +++ stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java Tue May 17 22:20:49 2016 @@ -27,13 +27,13 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map.Entry; -import org.apache.clerezza.rdf.core.Language; +import org.apache.clerezza.commons.rdf.Language; import org.apache.clerezza.rdf.core.LiteralFactory; -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.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +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.commons.rdf.impl.utils.PlainLiteralImpl; +import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; import org.apache.commons.io.IOUtils; import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory; import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants; @@ -83,7 +83,7 @@ public class DBPSpotlightDisambiguateEnh private static ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance(); private ContentItem ci; - private static Entry<UriRef, Blob> textContentPart; + private static Entry<IRI, Blob> textContentPart; @BeforeClass public static void oneTimeSetup() throws Exception { @@ -108,9 +108,9 @@ public class DBPSpotlightDisambiguateEnh //we need also to create a fise:TextAnnotation to test disambiguation String selected = "Angela Merkel"; Language en = new Language("en"); - UriRef textAnnotation = EnhancementEngineHelper.createTextEnhancement(ci, + IRI textAnnotation = EnhancementEngineHelper.createTextEnhancement(ci, new DBPSpotlightSpotEnhancementEngine()); - MGraph model = ci.getMetadata(); + Graph model = ci.getMetadata(); model.add(new TripleImpl(textAnnotation, Properties.ENHANCER_SELECTED_TEXT, new PlainLiteralImpl(selected,en))); model.add(new TripleImpl(textAnnotation, Properties.ENHANCER_SELECTION_CONTEXT, @@ -159,7 +159,7 @@ public class DBPSpotlightDisambiguateEnh RemoteServiceHelper.checkServiceUnavailable(e); return; } - HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>(); + HashMap<IRI,RDFTerm> expectedValues = new HashMap<IRI,RDFTerm>(); expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri()); expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral( dbpslight.getClass().getName())); Modified: stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java (original) +++ stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java Tue May 17 22:20:49 2016 @@ -29,10 +29,10 @@ import java.util.HashMap; import java.util.Map.Entry; import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.Resource; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +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.TripleImpl; import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory; import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants; import org.apache.stanbol.enhancer.engines.dbpspotlight.TestDefaults; @@ -76,7 +76,7 @@ public class DBPSpotlightSpotEnhancement private static ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance(); private ContentItem ci; - private static Entry<UriRef, Blob> textContentPart; + private static Entry<IRI, Blob> textContentPart; @BeforeClass public static void oneTimeSetup() throws Exception { @@ -129,7 +129,7 @@ public class DBPSpotlightSpotEnhancement RemoteServiceHelper.checkServiceUnavailable(e); return; } - HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>(); + HashMap<IRI,RDFTerm> expectedValues = new HashMap<IRI,RDFTerm>(); expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri()); expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral( dbpslight.getClass().getName())); Modified: stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceConstants.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceConstants.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceConstants.java (original) +++ stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceConstants.java Tue May 17 22:20:49 2016 @@ -19,10 +19,9 @@ package org.apache.stanbol.enhancer.engi import java.util.Collections; import java.util.Set; -import org.apache.clerezza.rdf.core.Language; -import org.apache.clerezza.rdf.core.PlainLiteral; -import org.apache.clerezza.rdf.core.Triple; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.Language; +import org.apache.clerezza.commons.rdf.Triple; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.enhancer.servicesapi.rdf.Properties; /** @@ -79,7 +78,7 @@ public interface DereferenceConstants { * dereferencing entities. * @since 0.12.1 (<a href="https://issues.apache.org/jira/browse/STANBOL-1334";>STANBOL-1334</a>) */ - Set<UriRef> DEFAULT_ENTITY_REFERENCES = Collections.unmodifiableSet( + Set<IRI> DEFAULT_ENTITY_REFERENCES = Collections.unmodifiableSet( Collections.singleton(Properties.ENHANCER_ENTITY_REFERENCE)); /** Modified: stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceContext.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceContext.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceContext.java (original) +++ stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceContext.java Tue May 17 22:20:49 2016 @@ -13,7 +13,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.commons.lang.StringUtils; import org.apache.stanbol.commons.namespaceprefix.NamespaceMappingUtils; import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService; @@ -48,7 +48,7 @@ public class DereferenceContext { private Set<String> languages; private List<String> fields; private String program; - private HashSet<UriRef> entityReferences; + private HashSet<IRI> entityReferences; @@ -84,13 +84,13 @@ public class DereferenceContext { DereferenceConstants.ENTITY_REFERENCES); } //start with the references present in the config - this.entityReferences = new HashSet<UriRef>(getConfig().getEntityReferences()); + this.entityReferences = new HashSet<IRI>(getConfig().getEntityReferences()); if(entityRefProps != null && !entityRefProps.isEmpty()){ NamespacePrefixService nps = engine.getConfig().getNsPrefixService(); for(String prop : entityRefProps){ if(!StringUtils.isBlank(prop)){ try { - entityReferences.add(new UriRef( + entityReferences.add(new IRI( NamespaceMappingUtils.getConfiguredUri(nps, prop))); } catch(IllegalArgumentException e){ throw new DereferenceConfigurationException(e, @@ -287,7 +287,7 @@ public class DereferenceContext { * @return the entity reference properties * @see DereferenceEngineConfig#getEntityReferences() */ - public HashSet<UriRef> getEntityReferences() { + public HashSet<IRI> getEntityReferences() { return entityReferences; } Modified: stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineConfig.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineConfig.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineConfig.java (original) +++ stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineConfig.java Tue May 17 22:20:49 2016 @@ -13,7 +13,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.commons.lang.StringUtils; import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService; import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine; @@ -30,7 +30,7 @@ public class DereferenceEngineConfig imp private String ldpath; private List<String> dereferenced; private Set<String> languages; - private Set<UriRef> entityReferences; + private Set<IRI> entityReferences; /** * Creates a DereferenceEngine configuration based on a Dictionary. Typically @@ -127,7 +127,7 @@ public class DereferenceEngineConfig imp * is present * @since 0.12.1 (<a href="https://issues.apache.org/jira/browse/STANBOL-1334";>STANBOL-1334</a>) */ - public Set<UriRef> getEntityReferences() { + public Set<IRI> getEntityReferences() { return entityReferences; } @@ -164,17 +164,17 @@ public class DereferenceEngineConfig imp * @return * @throws ConfigurationException */ - private Set<UriRef> parseEntityReferences() throws ConfigurationException { - Set<UriRef> entityRefPropUris; + private Set<IRI> parseEntityReferences() throws ConfigurationException { + Set<IRI> entityRefPropUris; Collection<String> entityProps = EnhancementEngineHelper.getConfigValues( config, ENTITY_REFERENCES, String.class); if(entityProps == null || entityProps.isEmpty()){ entityRefPropUris = DEFAULT_ENTITY_REFERENCES; } else { - entityRefPropUris = new HashSet<UriRef>(entityProps.size()); + entityRefPropUris = new HashSet<IRI>(entityProps.size()); for(String prop : entityProps){ if(!StringUtils.isBlank(prop)){ - entityRefPropUris.add(new UriRef(getConfiguredUri(nsPrefixService, + entityRefPropUris.add(new IRI(getConfiguredUri(nsPrefixService, ENTITY_REFERENCES, prop.trim()))); } } Modified: stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceException.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceException.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceException.java (original) +++ stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceException.java Tue May 17 22:20:49 2016 @@ -16,16 +16,16 @@ */ package org.apache.stanbol.enhancer.engines.dereference; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; public class DereferenceException extends Exception { private static final long serialVersionUID = 1524436328783083428L; - public DereferenceException(UriRef entity, Throwable t){ + public DereferenceException(IRI entity, Throwable t){ super("Unable to dereference Entity " + entity+ "!", t); } - public DereferenceException(UriRef entity, String reason){ + public DereferenceException(IRI entity, String reason){ super("Unable to dereference Entity " + entity + (reason != null ? ": "+ reason : "") + "!"); } Modified: stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferenceEngine.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferenceEngine.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferenceEngine.java (original) +++ stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferenceEngine.java Tue May 17 22:20:49 2016 @@ -36,11 +36,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.clerezza.rdf.core.MGraph; -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.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.IRI; import org.apache.stanbol.commons.stanboltools.offline.OfflineMode; import org.apache.stanbol.enhancer.servicesapi.ContentItem; import org.apache.stanbol.enhancer.servicesapi.EngineException; @@ -218,15 +218,15 @@ public class EntityDereferenceEngine imp long start = System.nanoTime(); Map<String,Object> enhancemntProps = EnhancementEngineHelper.getEnhancementProperties(this, ci); final DereferenceContext derefContext; - final MGraph metadata = ci.getMetadata(); - Set<UriRef> referencedEntities = new HashSet<UriRef>(); + final Graph metadata = ci.getMetadata(); + Set<IRI> referencedEntities = new HashSet<IRI>(); ci.getLock().readLock().lock(); try { //(1) Create the DereferenceContext if(filterContentLanguages){ //parse the languages detected for the content Set<String> contentLanguages = new HashSet<String>(); - for(NonLiteral langAnno : EnhancementEngineHelper.getLanguageAnnotations(metadata)){ + for(BlankNodeOrIRI langAnno : EnhancementEngineHelper.getLanguageAnnotations(metadata)){ contentLanguages.add(EnhancementEngineHelper.getString(metadata, langAnno, DC_LANGUAGE)); } enhancemntProps.put(DereferenceContext.INTERNAL_CONTENT_LANGUAGES, contentLanguages); @@ -250,18 +250,18 @@ public class EntityDereferenceEngine imp //parse the referenced entities from the graph //(2) read all Entities we need to dereference from the parsed contentItem - Set<UriRef> checked = new HashSet<UriRef>(); + Set<IRI> checked = new HashSet<IRI>(); //since STANBOL-1334 the list of properties that refer to entities can be configured - for(UriRef referenceProperty : derefContext.getEntityReferences()){ + for(IRI referenceProperty : derefContext.getEntityReferences()){ Iterator<Triple> entityReferences = metadata.filter(null, referenceProperty, null); while(entityReferences.hasNext()){ Triple triple = entityReferences.next(); - Resource entityReference = triple.getObject(); - if((entityReference instanceof UriRef) && //only URIs - checked.add((UriRef)entityReference) && //do not check a URI twice - chekcFallbackMode((UriRef)entityReference, metadata) && //fallback mode - checkURI((UriRef)entityReference)){ //URI prefixes and patterns - boolean added = referencedEntities.add((UriRef)entityReference); + RDFTerm entityReference = triple.getObject(); + if((entityReference instanceof IRI) && //only URIs + checked.add((IRI)entityReference) && //do not check a URI twice + chekcFallbackMode((IRI)entityReference, metadata) && //fallback mode + checkURI((IRI)entityReference)){ //URI prefixes and patterns + boolean added = referencedEntities.add((IRI)entityReference); if(added && log.isTraceEnabled()){ log.trace(" ... schedule Entity {} (referenced-by: {})", entityReference, referenceProperty); @@ -282,13 +282,13 @@ public class EntityDereferenceEngine imp referencedEntities.size()); //(2) dereference the Entities ExecutorService executor = dereferencer.getExecutor(); - Set<UriRef> failedEntities = new HashSet<UriRef>(); + Set<IRI> failedEntities = new HashSet<IRI>(); int dereferencedCount = 0; List<DereferenceJob> dereferenceJobs = new ArrayList<DereferenceJob>( referencedEntities.size()); if(executor != null && !executor.isShutdown()){ //dereference using executor //schedule all entities to dereference - for(final UriRef entity : referencedEntities){ + for(final IRI entity : referencedEntities){ DereferenceJob dereferenceJob = new DereferenceJob(entity, metadata, writeLock, derefContext); dereferenceJob.setFuture(executor.submit(dereferenceJob)); @@ -318,7 +318,7 @@ public class EntityDereferenceEngine imp } } } else { //dereference using the current thread - for(UriRef entity : referencedEntities){ + for(IRI entity : referencedEntities){ try { log.trace(" ... dereference {}", entity); if(dereferencer.dereference(entity, metadata, writeLock, derefContext)){ @@ -357,7 +357,7 @@ public class EntityDereferenceEngine imp return name; } - protected boolean chekcFallbackMode(UriRef entityReference, MGraph metadata) { + protected boolean chekcFallbackMode(IRI entityReference, Graph metadata) { return fallbackMode ? //in case we use fallback mode //filter entities for those an outgoing relation is present !metadata.filter(entityReference, null, null).hasNext() : @@ -370,7 +370,7 @@ public class EntityDereferenceEngine imp * @return <code>true</code> if this entity should be scheduled for * dereferencing. <code>false</code> if not. */ - protected boolean checkURI(UriRef entity){ + protected boolean checkURI(IRI entity){ if(!uriFilterPresent){ //if no prefix nor pattern is set return true; //accept all } @@ -454,14 +454,14 @@ public class EntityDereferenceEngine imp */ class DereferenceJob implements Callable<Boolean> { - final UriRef entity; - final MGraph metadata; + final IRI entity; + final Graph metadata; final Lock writeLock; final DereferenceContext derefContext; private Future<Boolean> future; - DereferenceJob(UriRef entity, MGraph metadata, Lock writeLock, + DereferenceJob(IRI entity, Graph metadata, Lock writeLock, DereferenceContext derefContext){ this.entity = entity; this.metadata = metadata; Modified: stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferencer.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferencer.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferencer.java (original) +++ stanbol/trunk/enhancement-engines/dereference/core/src/main/java/org/apache/stanbol/enhancer/engines/dereference/EntityDereferencer.java Tue May 17 22:20:49 2016 @@ -20,8 +20,8 @@ import java.util.ConcurrentModificationE import java.util.concurrent.ExecutorService; import java.util.concurrent.locks.Lock; -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.stanbol.commons.stanboltools.offline.OfflineMode; import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine; @@ -54,7 +54,7 @@ public interface EntityDereferencer { ExecutorService getExecutor(); /** - * Dereferences the Entity with the parsed {@link UriRef} by copying the + * Dereferences the Entity with the parsed {@link IRI} by copying the * data to the parsed graph * @param graph the graph to add the dereferenced entity * @param entity the uri of the Entity to dereference @@ -72,7 +72,7 @@ public interface EntityDereferencer { * @throws DereferenceException on any error while dereferencing the * requested Entity */ - boolean dereference(UriRef entity, MGraph graph, Lock writeLock, + boolean dereference(IRI entity, Graph graph, Lock writeLock, DereferenceContext dereferenceContext) throws DereferenceException; } Modified: stanbol/trunk/enhancement-engines/dereference/core/src/test/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/core/src/test/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/core/src/test/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineTest.java (original) +++ stanbol/trunk/enhancement-engines/dereference/core/src/test/java/org/apache/stanbol/enhancer/engines/dereference/DereferenceEngineTest.java Tue May 17 22:20:49 2016 @@ -34,15 +34,15 @@ import java.util.concurrent.ExecutorServ import java.util.concurrent.Executors; import java.util.concurrent.locks.Lock; -import org.apache.clerezza.rdf.core.Language; +import org.apache.clerezza.commons.rdf.Language; import org.apache.clerezza.rdf.core.LiteralFactory; -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.UriRef; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.TripleImpl; -import org.apache.stanbol.commons.indexedgraph.IndexedMGraph; +import org.apache.clerezza.commons.rdf.Graph; +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.TripleImpl; +import org.apache.stanbol.commons.indexedgraph.IndexedGraph; import org.apache.stanbol.commons.stanboltools.offline.OfflineMode; import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory; import org.apache.stanbol.enhancer.servicesapi.ContentItem; @@ -71,21 +71,21 @@ public class DereferenceEngineTest { /** * The metadata used by this test */ - private static TripleCollection testData; + private static Graph testData; - private static TripleCollection testMetadata; + private static Graph testMetadata; - public static final UriRef NAME = new UriRef(NamespaceEnum.rdfs+"label"); - public static final UriRef TYPE = new UriRef(NamespaceEnum.rdf+"type"); - public static final UriRef REDIRECT = new UriRef(NamespaceEnum.rdfs+"seeAlso"); + public static final IRI NAME = new IRI(NamespaceEnum.rdfs+"label"); + public static final IRI TYPE = new IRI(NamespaceEnum.rdf+"type"); + public static final IRI REDIRECT = new IRI(NamespaceEnum.rdfs+"seeAlso"); - public static final UriRef OTHER_ENTITY_REFERENCE = new UriRef( + public static final IRI OTHER_ENTITY_REFERENCE = new IRI( "http://www.example.org/stanbol/enhancer/dereference/test#other-entity-reference";); private static final ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance(); private static final LiteralFactory lf = LiteralFactory.getInstance(); - private static final UriRef SKOS_NOTATION = new UriRef(NamespaceEnum.skos+"notation"); + private static final IRI SKOS_NOTATION = new IRI(NamespaceEnum.skos+"notation"); private static final Language LANG_EN = new Language("en"); private static final Language LANG_DE = new Language("de"); @@ -97,14 +97,14 @@ public class DereferenceEngineTest { @BeforeClass public static void setUpServices() throws IOException { - testData = new IndexedMGraph(); + testData = new IndexedGraph(); long seed = System.currentTimeMillis(); log.info("Test seed "+ seed); Random random = new Random(seed); int numEntities = 0; for(int i = 0; i < NUM_ENTITIES ; i++){ if(random.nextFloat() <= PERCENTAGE_PRESENT){ //do not create all entities - UriRef uri = new UriRef("urn:test:entity"+i); + IRI uri = new IRI("urn:test:entity"+i); testData.add(new TripleImpl(uri, RDF_TYPE, SKOS_CONCEPT)); testData.add(new TripleImpl(uri, RDFS_LABEL, new PlainLiteralImpl("entity "+i, LANG_EN))); @@ -116,20 +116,20 @@ public class DereferenceEngineTest { } } log.info(" ... created {} Entities",numEntities); - testMetadata = new IndexedMGraph(); + testMetadata = new IndexedGraph(); int numLinks = 0; int numOtherLinks = 0; for(int i = 0; i < NUM_ENTITIES ; i++){ float r = random.nextFloat(); if(r < PERCENTAGE_LINKED){ - UriRef enhancementUri = new UriRef("urn:test:enhancement"+i); - UriRef entityUri = new UriRef("urn:test:entity"+i); + IRI enhancementUri = new IRI("urn:test:enhancement"+i); + IRI entityUri = new IRI("urn:test:entity"+i); //we do not need any other triple for testing in the contentItem testMetadata.add(new TripleImpl(enhancementUri, ENHANCER_ENTITY_REFERENCE, entityUri)); numLinks++; } else if((r-PERCENTAGE_LINKED) < PERCENTAGE_LINKED_OTHER){ - UriRef enhancementUri = new UriRef("urn:test:enhancement"+i); - UriRef entityUri = new UriRef("urn:test:entity"+i); + IRI enhancementUri = new IRI("urn:test:enhancement"+i); + IRI entityUri = new IRI("urn:test:entity"+i); //we do not need any other triple for testing in the contentItem testMetadata.add(new TripleImpl(enhancementUri, OTHER_ENTITY_REFERENCE, entityUri)); numOtherLinks++; @@ -141,7 +141,7 @@ public class DereferenceEngineTest { } public static ContentItem getContentItem(final String id) throws IOException { - ContentItem ci = ciFactory.createContentItem(new UriRef(id), new StringSource("Not used")); + ContentItem ci = ciFactory.createContentItem(new IRI(id), new StringSource("Not used")); ci.getMetadata().addAll(testMetadata); return ci; } @@ -239,19 +239,19 @@ public class DereferenceEngineTest { validateDereferencedEntities(ci.getMetadata(), OTHER_ENTITY_REFERENCE, ENHANCER_ENTITY_REFERENCE); } - private void validateDereferencedEntities(TripleCollection metadata, UriRef...entityReferenceFields) { - MGraph expected = new IndexedMGraph(); - for(UriRef entityReferenceField : entityReferenceFields){ + private void validateDereferencedEntities(Graph metadata, IRI...entityReferenceFields) { + Graph expected = new IndexedGraph(); + for(IRI entityReferenceField : entityReferenceFields){ Iterator<Triple> referenced = metadata.filter(null, entityReferenceField, null); while(referenced.hasNext()){ - UriRef entity = (UriRef)referenced.next().getObject(); + IRI entity = (IRI)referenced.next().getObject(); Iterator<Triple> entityTriples = testData.filter(entity, null, null); while(entityTriples.hasNext()){ expected.add(entityTriples.next()); } } } - MGraph notExpected = new IndexedMGraph(testData); + Graph notExpected = new IndexedGraph(testData); notExpected.removeAll(expected); Assert.assertTrue(metadata.containsAll(expected)); Assert.assertTrue(Collections.disjoint(metadata, notExpected)); @@ -276,7 +276,7 @@ public class DereferenceEngineTest { } @Override - public boolean dereference(UriRef entity, MGraph graph, Lock writeLock, DereferenceContext context) throws DereferenceException { + public boolean dereference(IRI entity, Graph graph, Lock writeLock, DereferenceContext context) throws DereferenceException { Iterator<Triple> entityTriples = testData.filter(entity, null, null); if(entityTriples.hasNext()){ writeLock.lock(); Modified: stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java (original) +++ stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java Tue May 17 22:20:49 2016 @@ -32,10 +32,10 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.locks.Lock; -import org.apache.clerezza.rdf.core.Language; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; +import org.apache.clerezza.commons.rdf.Language; +import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.commons.rdf.IRI; +import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph; import org.apache.commons.lang.StringUtils; import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.marmotta.ldpath.exception.LDPathParseException; @@ -283,7 +283,7 @@ public abstract class TrackingDereferenc } @Override - public final boolean dereference(UriRef uri, MGraph graph, Lock writeLock, DereferenceContext dc) throws DereferenceException { + public final boolean dereference(IRI uri, Graph graph, Lock writeLock, DereferenceContext dc) throws DereferenceException { T service = getService(); if(service == null){ throw new DereferenceException(uri, serviceClass.getClass().getSimpleName() @@ -321,7 +321,7 @@ public abstract class TrackingDereferenc } /** * Executes the {@link #ldpathProgram} using the parsed URI as context and - * writes the the results to the parsed Graph + * writes the the results to the parsed ImmutableGraph * @param uri the context * @param rdfBackend the RdfBackend the LDPath program is executed on * @param ldpathProgram The {@link Program} parsed via the dereference context @@ -331,15 +331,15 @@ public abstract class TrackingDereferenc * @throws DereferenceException on any {@link EntityhubException} while * executing the LDPath program */ - private void copyLdPath(UriRef uri, RDFBackend<Object> rdfBackend, Program<Object> ldpathProgram, - Set<String> langs, MGraph graph, Lock writeLock) throws DereferenceException { + private void copyLdPath(IRI uri, RDFBackend<Object> rdfBackend, Program<Object> ldpathProgram, + Set<String> langs, Graph graph, Lock writeLock) throws DereferenceException { //A RdfReference needs to be used as context RdfReference context = valueFactory.createReference(uri); //create the representation that stores results in an intermediate //graph (we do not want partial results on an error - MGraph ldPathResults = new SimpleMGraph(); + Graph ldPathResults = new SimpleGraph(); RdfRepresentation result = valueFactory.createRdfRepresentation(uri, ldPathResults); - //execute the LDPath Program and write results to the RDF Graph + //execute the LDPath Program and write results to the RDF ImmutableGraph try { for(org.apache.marmotta.ldpath.model.fields.FieldMapping<?,Object> mapping : ldpathProgram.getFields()) { Collection<?> values; @@ -405,8 +405,8 @@ public abstract class TrackingDereferenc * @param graph the graph to store the mapping results * @param writeLock the write lock for the graph */ - private void copyMapped(UriRef uri, Representation rep, FieldMapper fieldMapper, Set<String> langs, - MGraph graph, Lock writeLock) { + private void copyMapped(IRI uri, Representation rep, FieldMapper fieldMapper, Set<String> langs, + Graph graph, Lock writeLock) { //NOTE: The fieldMapper parsed via the context does already have a // filter for the parsed languages. Because of that the old code // adding such a language filter is no longer needed @@ -439,7 +439,7 @@ public abstract class TrackingDereferenc * @param graph the graph to copy the data * @param writeLock the write lock for the graph */ - private void copyAll(UriRef uri, Representation rep, MGraph graph, Lock writeLock) { + private void copyAll(IRI uri, Representation rep, Graph graph, Lock writeLock) { writeLock.lock(); try { if(log.isTraceEnabled()){ Modified: stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguationData.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguationData.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguationData.java (original) +++ stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguationData.java Tue May 17 22:20:49 2016 @@ -31,9 +31,9 @@ import java.util.NavigableMap; import java.util.Set; import java.util.TreeMap; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.Triple; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.commons.rdf.Triple; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.enhancer.servicesapi.ContentItem; import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper; import org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum; @@ -60,7 +60,7 @@ public final class DisambiguationData { * This is needed during writing the disambiguation results to the EnhancementStructure to know if one * needs to clone an fise:EntityAnnotation or not. */ - public Map<UriRef,Set<UriRef>> suggestionMap = new HashMap<UriRef,Set<UriRef>>(); + public Map<IRI,Set<IRI>> suggestionMap = new HashMap<IRI,Set<IRI>>(); /** * Holds the center position of the fise:TextAnnotation fise:selected-text as key and the SavedEntity @@ -79,7 +79,7 @@ public final class DisambiguationData { * List of all fise:textAnnotations that can be used for disambiguation. the key is the URI and the value * is the {@link SavedEntity} with the extracted information. */ - public Map<UriRef,SavedEntity> textAnnotations = new HashMap<UriRef,SavedEntity>(); + public Map<IRI,SavedEntity> textAnnotations = new HashMap<IRI,SavedEntity>(); // List to contain old confidence values that are to removed // List<Triple> loseConfidence = new ArrayList<Triple>(); @@ -92,14 +92,14 @@ public final class DisambiguationData { * ambiguations for all entities (which will be removed eventually) */ public static DisambiguationData createFromContentItem(ContentItem ci) { - MGraph graph = ci.getMetadata(); + Graph graph = ci.getMetadata(); DisambiguationData data = new DisambiguationData(); Iterator<Triple> it = graph.filter(null, RDF_TYPE, TechnicalClasses.ENHANCER_TEXTANNOTATION); while (it.hasNext()) { - UriRef uri = (UriRef) it.next().getSubject(); + IRI uri = (IRI) it.next().getSubject(); // TODO: rwesten: do we really want to ignore fise:TextAnnotations that link to // to an other one (typically two TextAnnotations that select the exact same text) - // if (graph.filter(uri, new UriRef(NamespaceEnum.dc + "relation"), null).hasNext()) { + // if (graph.filter(uri, new IRI(NamespaceEnum.dc + "relation"), null).hasNext()) { // continue; // } @@ -110,9 +110,9 @@ public final class DisambiguationData { Integer.valueOf((savedEntity.getStart() + savedEntity.getEnd()) / 2), savedEntity); // add information to the #suggestionMap for (Suggestion s : savedEntity.getSuggestions()) { - Set<UriRef> textAnnotations = data.suggestionMap.get(s.getEntityAnnotation()); + Set<IRI> textAnnotations = data.suggestionMap.get(s.getEntityAnnotation()); if (textAnnotations == null) { - textAnnotations = new HashSet<UriRef>(); + textAnnotations = new HashSet<IRI>(); data.suggestionMap.put(s.getEntityAnnotation(), textAnnotations); } textAnnotations.add(savedEntity.getUri()); Modified: stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguatorEngine.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguatorEngine.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguatorEngine.java (original) +++ stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguatorEngine.java Tue May 17 22:20:49 2016 @@ -33,10 +33,10 @@ import java.util.NavigableMap; import java.util.Set; import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.Triple; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.commons.rdf.Triple; +import org.apache.clerezza.commons.rdf.IRI; +import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; import org.apache.commons.lang.StringUtils; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; @@ -190,7 +190,7 @@ public class DisambiguatorEngine extends public void computeEnhancements(ContentItem ci) throws EngineException { String textContent; - Entry<UriRef,Blob> textBlob = ContentItemHelper.getBlob(ci, SUPPORTED_MIMETYPES); + Entry<IRI,Blob> textBlob = ContentItemHelper.getBlob(ci, SUPPORTED_MIMETYPES); if (textBlob != null) { try { textContent = ContentItemHelper.getText(textBlob.getValue()); @@ -202,7 +202,7 @@ public class DisambiguatorEngine extends textContent = null; } - MGraph graph = ci.getMetadata(); + Graph graph = ci.getMetadata(); // (1) read the data from the content item String contentLangauge; @@ -346,11 +346,11 @@ public class DisambiguatorEngine extends // the disambiguation result the ambiguation is kept but the overall // fise:confidence values are reduced by #confidenceWeight (ensured to be // less than 1) - // protected List<Triple> unchangedConfidences(List<UriRef> subsumed, - // MGraph graph, + // protected List<Triple> unchangedConfidences(List<IRI> subsumed, + // Graph graph, // List<Triple> loseConfidence) { // for (int i = 0; i < subsumed.size(); i++) { - // UriRef uri = subsumed.get(i); + // IRI uri = subsumed.get(i); // Iterator<Triple> confidenceTriple = graph.filter(uri, ENHANCER_CONFIDENCE, null); // while (confidenceTriple.hasNext()) { // loseConfidence.remove(confidenceTriple.next()); @@ -417,7 +417,7 @@ public class DisambiguatorEngine extends if (maxScore == null) { maxScore = score; } - UriRef uri = new UriRef(guess.getId()); + IRI uri = new IRI(guess.getId()); Suggestion suggestion = savedEntity.getSuggestion(uri); if (suggestion == null) { log.info(" - not found {}", guess.getId()); @@ -460,13 +460,13 @@ public class DisambiguatorEngine extends // NOTE (rwesten): now done as part of the disambiguateSuggestions(..) // method. // protected boolean intersectionCheck(List<Suggestion> matches, - // List<UriRef> subsumed, - // MGraph graph, + // List<IRI> subsumed, + // Graph graph, // String contentLangauge) { // for (int i = 0; i < subsumed.size(); i++) { - // UriRef uri = subsumed.get(i); + // IRI uri = subsumed.get(i); // - // UriRef uri1 = EnhancementEngineHelper.getReference(graph, uri, new UriRef(NamespaceEnum.fise + // IRI uri1 = EnhancementEngineHelper.getReference(graph, uri, new IRI(NamespaceEnum.fise // + "entity-reference")); // // String selectedText = EnhancementEngineHelper.getString(graph, uri, ENHANCER_ENTITY_LABEL); @@ -576,16 +576,16 @@ public class DisambiguatorEngine extends // method. Results are stored in the Suggestions (member of SavedEntiy) and // than written back to the EnhancementStructure in a separate step // protected List<Triple> intersection(List<Suggestion> matches, - // List<UriRef> subsumed, - // MGraph graph, + // List<IRI> subsumed, + // Graph graph, // List<Triple> gainConfidence, // String contentLangauge) { // // for (int i = 0; i < subsumed.size(); i++) { // boolean matchFound = false; - // UriRef uri = subsumed.get(i); + // IRI uri = subsumed.get(i); // - // UriRef uri1 = EnhancementEngineHelper.getReference(graph, uri, new UriRef(NamespaceEnum.fise + // IRI uri1 = EnhancementEngineHelper.getReference(graph, uri, new IRI(NamespaceEnum.fise // + "entity-reference")); // // for (int j = 0; j < matches.size(); j++) { @@ -596,8 +596,8 @@ public class DisambiguatorEngine extends // && suggestName.compareToIgnoreCase(uri1.getUnicodeString()) == 0) { // Triple confidenceTriple = new TripleImpl(uri, ENHANCER_CONFIDENCE, LiteralFactory // .getInstance().createTypedLiteral(suggestion.getScore())); - // Triple contributorTriple = new TripleImpl((UriRef) confidenceTriple.getSubject(), - // new UriRef(NamespaceEnum.dc + "contributor"), LiteralFactory.getInstance() + // Triple contributorTriple = new TripleImpl((IRI) confidenceTriple.getSubject(), + // new IRI(NamespaceEnum.dc + "contributor"), LiteralFactory.getInstance() // .createTypedLiteral(this.getClass().getName())); // gainConfidence.add(confidenceTriple); // gainConfidence.add(contributorTriple); @@ -608,7 +608,7 @@ public class DisambiguatorEngine extends // if (!matchFound) { // Triple confidenceTriple = new TripleImpl(uri, ENHANCER_CONFIDENCE, LiteralFactory // .getInstance().createTypedLiteral(0.0)); - // Triple contributorTriple = new TripleImpl((UriRef) confidenceTriple.getSubject(), new UriRef( + // Triple contributorTriple = new TripleImpl((IRI) confidenceTriple.getSubject(), new IRI( // NamespaceEnum.dc + "contributor"), LiteralFactory.getInstance().createTypedLiteral( // this.getClass().getName())); // gainConfidence.add(confidenceTriple); @@ -620,7 +620,7 @@ public class DisambiguatorEngine extends // } /* Removes the value in lose confidence from the graph */ - protected void removeOldConfidenceFromGraph(MGraph graph, List<Triple> loseConfidence) { + protected void removeOldConfidenceFromGraph(Graph graph, List<Triple> loseConfidence) { for (int i = 0; i < loseConfidence.size(); i++) { Triple elementToRemove = loseConfidence.get(i); graph.remove(elementToRemove); @@ -635,7 +635,7 @@ public class DisambiguatorEngine extends * @param disData * the disambiguation data */ - protected void applyDisambiguationResults(MGraph graph, DisambiguationData disData) { + protected void applyDisambiguationResults(Graph graph, DisambiguationData disData) { for (SavedEntity savedEntity : disData.textAnnotations.values()) { for (Suggestion s : savedEntity.getSuggestions()) { if (s.getDisambiguatedConfidence() != null) { @@ -697,8 +697,8 @@ public class DisambiguatorEngine extends * @param textAnnotation * @return */ - public static UriRef cloneTextAnnotation(MGraph graph, UriRef entityAnnotation, UriRef textAnnotation) { - UriRef copy = new UriRef("urn:enhancement-" + EnhancementEngineHelper.randomUUID()); + public static IRI cloneTextAnnotation(Graph graph, IRI entityAnnotation, IRI textAnnotation) { + IRI copy = new IRI("urn:enhancement-" + EnhancementEngineHelper.randomUUID()); Iterator<Triple> it = graph.filter(entityAnnotation, null, null); // we can not add triples to the graph while iterating. So store them // in a list and add later Modified: stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java (original) +++ stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/SavedEntity.java Tue May 17 22:20:49 2016 @@ -35,12 +35,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.clerezza.rdf.core.Literal; import org.apache.clerezza.rdf.core.LiteralFactory; -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.commons.rdf.IRI; import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper; import org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum; import org.apache.stanbol.enhancer.servicesapi.rdf.Properties; @@ -58,8 +57,8 @@ public final class SavedEntity { */ private final static LiteralFactory literalFactory = LiteralFactory.getInstance(); private String name; - private UriRef type; - private UriRef uri; + private IRI type; + private IRI uri; private String context; private Integer start; private Integer end; @@ -68,7 +67,7 @@ public final class SavedEntity { * Map with the suggestion. The key is the URI of the fise:EntityAnnotation and the value is the Triple * with the confidence value */ - private Map<UriRef,Suggestion> suggestions = new LinkedHashMap<UriRef,Suggestion>(); + private Map<IRI,Suggestion> suggestions = new LinkedHashMap<IRI,Suggestion>(); /** * The name of the Entityhub {@link Site} managing the suggestions of this fise:TextAnnotation @@ -76,7 +75,7 @@ public final class SavedEntity { private String site; /** - * private constructor only used by {@link #createFromTextAnnotation(TripleCollection, NonLiteral)} + * private constructor only used by {@link #createFromTextAnnotation(Graph, BlankNodeOrIRI)} */ private SavedEntity() {} @@ -90,7 +89,7 @@ public final class SavedEntity { * @return the {@link SavedEntity} or <code>null</code> if the parsed text annotation is missing required * information. */ - public static SavedEntity createFromTextAnnotation(TripleCollection graph, UriRef textAnnotation) { + public static SavedEntity createFromTextAnnotation(Graph graph, IRI textAnnotation) { SavedEntity entity = new SavedEntity(); entity.uri = textAnnotation; entity.name = EnhancementEngineHelper.getString(graph, textAnnotation, ENHANCER_SELECTED_TEXT); @@ -140,7 +139,7 @@ public final class SavedEntity { // NOTE: this iterator will also include dc:relation between fise:TextAnnotation's // but in those cases NULL will be returned as suggestion while (suggestions.hasNext()) { - UriRef entityAnnotation = (UriRef) suggestions.next().getSubject(); + IRI entityAnnotation = (IRI) suggestions.next().getSubject(); Suggestion suggestion = Suggestion.createFromEntityAnnotation(graph, entityAnnotation); if (suggestion != null) { suggestionList.add(suggestion); @@ -199,7 +198,7 @@ public final class SavedEntity { * * @return the type */ - public final UriRef getType() { + public final IRI getType() { return type; } @@ -218,7 +217,7 @@ public final class SavedEntity { return String.format("SavedEntity %s (name=%s | type=%s)", uri, name, type); } - public UriRef getUri() { + public IRI getUri() { return this.uri; } @@ -238,7 +237,7 @@ public final class SavedEntity { return suggestions.values(); } - public Suggestion getSuggestion(UriRef uri) { + public Suggestion getSuggestion(IRI uri) { return suggestions.get(uri); } Modified: stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java (original) +++ stanbol/trunk/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/Suggestion.java Tue May 17 22:20:49 2016 @@ -24,10 +24,10 @@ import static org.apache.stanbol.enhance import java.util.SortedMap; import java.util.SortedSet; -import org.apache.clerezza.rdf.core.Literal; import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.TripleCollection; -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.commons.rdf.Literal; import org.apache.stanbol.enhancer.servicesapi.ContentItem; import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper; import org.apache.stanbol.enhancer.servicesapi.rdf.Properties; @@ -47,10 +47,10 @@ public class Suggestion implements Compa private static final LiteralFactory lf = LiteralFactory.getInstance(); - private static final UriRef ENTITYHUB_SITE = new UriRef(RdfResourceEnum.site.getUri()); + private static final IRI ENTITYHUB_SITE = new IRI(RdfResourceEnum.site.getUri()); - private UriRef entityAnnotation; - private UriRef entityUri; + private IRI entityAnnotation; + private IRI entityUri; private Double originalConfidnece; private Entity entity; @@ -58,13 +58,13 @@ public class Suggestion implements Compa private Double disambiguatedConfidence; private String site; - private Suggestion(UriRef entityAnnotation) { + private Suggestion(IRI entityAnnotation) { this.entityAnnotation = entityAnnotation; } public Suggestion(Entity entity) { this.entity = entity; - this.entityUri = new UriRef(entity.getId()); + this.entityUri = new IRI(entity.getId()); this.site = entity.getSite(); } @@ -76,7 +76,7 @@ public class Suggestion implements Compa * @param entityAnnotation * @return */ - public static Suggestion createFromEntityAnnotation(TripleCollection graph, UriRef entityAnnotation) { + public static Suggestion createFromEntityAnnotation(Graph graph, IRI entityAnnotation) { Suggestion suggestion = new Suggestion(entityAnnotation); suggestion.entityUri = EnhancementEngineHelper.getReference(graph, entityAnnotation, ENHANCER_ENTITY_REFERENCE); @@ -110,7 +110,7 @@ public class Suggestion implements Compa * * @return the URI of the fise:EntityAnnotation or <code>null</code> if not present. */ - public UriRef getEntityAnnotation() { + public IRI getEntityAnnotation() { return entityAnnotation; } @@ -124,7 +124,7 @@ public class Suggestion implements Compa * @param uri * the uri of the cloned fise:EntityAnnotation */ - public void setEntityAnnotation(UriRef uri) { + public void setEntityAnnotation(IRI uri) { this.entityAnnotation = uri; } @@ -133,7 +133,7 @@ public class Suggestion implements Compa * * @return the URI */ - public UriRef getEntityUri() { + public IRI getEntityUri() { return entityUri; } @@ -238,8 +238,8 @@ public class Suggestion implements Compa : result; } - private static String getOrigin(TripleCollection graph, UriRef entityAnnotation) { - UriRef uOrigin = EnhancementEngineHelper.getReference(graph, entityAnnotation, ENHANCER_ORIGIN); + private static String getOrigin(Graph graph, IRI entityAnnotation) { + IRI uOrigin = EnhancementEngineHelper.getReference(graph, entityAnnotation, ENHANCER_ORIGIN); if (uOrigin != null) { return uOrigin.getUnicodeString(); } else { Modified: stanbol/trunk/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/CoMentionConstants.java URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/CoMentionConstants.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/CoMentionConstants.java (original) +++ stanbol/trunk/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/CoMentionConstants.java Tue May 17 22:20:49 2016 @@ -16,7 +16,7 @@ */ package org.apache.stanbol.enhancer.engines.entitycomention; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.enhancer.engines.entitylinking.config.EntityLinkerConfig; public interface CoMentionConstants { @@ -25,11 +25,11 @@ public interface CoMentionConstants { * The {@link EntityLinkerConfig#NAME_FIELD} uri internally used by the * {@link EntityCoMentionEngine}. */ - UriRef CO_MENTION_LABEL_FIELD = new UriRef("urn:org.stanbol:enhander.engine.entitycomention:co-mention-label"); + IRI CO_MENTION_LABEL_FIELD = new IRI("urn:org.stanbol:enhander.engine.entitycomention:co-mention-label"); /** * The {@link EntityLinkerConfig#TYPE_FIELD} uri internally used by the * {@link EntityCoMentionEngine}. */ - UriRef CO_MENTION_TYPE_FIELD = new UriRef("urn:org.stanbol:enhander.engine.entitycomention:co-mention-type"); + IRI CO_MENTION_TYPE_FIELD = new IRI("urn:org.stanbol:enhander.engine.entitycomention:co-mention-type"); }
