http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java index bae6534..1d0eabd 100644 --- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java +++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreRules.java @@ -16,7 +16,7 @@ */ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core";>lkif-core</a> @@ -52,17 +52,17 @@ public class LKIFCoreRules extends Vocabulary { /* http://www.estrellaproject.org/lkif-core/lkif-rules.owl */ ///////////////////////////////////////////////////////////// // CLASSES - public final URI Valid_Rule = createClass(NS, "Valid_Rule"); - public final URI Rule = createClass(NS, "Rule"); + public final IRI Valid_Rule = createClass(NS, "Valid_Rule"); + public final IRI Rule = createClass(NS, "Rule"); // RESOURCES // PROPERTIES - public final URI rule_predicate = createProperty(NS, "rule_predicate"); - public final URI prior = createProperty(NS, "prior"); - public final URI excluded = createProperty(NS, "excluded"); - public final URI applies = createProperty(NS, "applies"); - public final URI rebuts = createProperty(NS, "rebuts"); + public final IRI rule_predicate = createProperty(NS, "rule_predicate"); + public final IRI prior = createProperty(NS, "prior"); + public final IRI excluded = createProperty(NS, "excluded"); + public final IRI applies = createProperty(NS, "applies"); + public final IRI rebuts = createProperty(NS, "rebuts"); private LKIFCoreRules() { super(NS);
http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java index 4e8ef4b..7a21404 100644 --- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java +++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreTime.java @@ -16,7 +16,7 @@ */ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core";>lkif-core</a> @@ -49,25 +49,25 @@ public class LKIFCoreTime extends Vocabulary { /* http://www.estrellaproject.org/lkif-core/time.owl */ /////////////////////////////////////////////////////// // CLASSES - public final URI Interval = createClass(NS, "Interval"); - public final URI Moment = createClass(NS, "Moment"); - public final URI Pair_Of_Periods = createClass(NS, "Pair_Of_Periods"); - public final URI Temporal_Occurrence = createClass(NS, "Temporal_Occurrence"); + public final IRI Interval = createClass(NS, "Interval"); + public final IRI Moment = createClass(NS, "Moment"); + public final IRI Pair_Of_Periods = createClass(NS, "Pair_Of_Periods"); + public final IRI Temporal_Occurrence = createClass(NS, "Temporal_Occurrence"); // RESOURCES // PROPERTIES - public final URI after = createProperty(NS, "after"); - public final URI before = createProperty(NS, "before"); - public final URI between = createProperty(NS, "between"); - public final URI during = createProperty(NS, "during"); - public final URI finishes = createProperty(NS, "finishes"); - public final URI immediately_after = createProperty(NS, "immediately_after"); - public final URI immediately_before = createProperty(NS, "immediately_before"); - public final URI overlap = createProperty(NS, "overlap"); - public final URI preceeds = createProperty(NS, "preceeds"); - public final URI starts = createProperty(NS, "starts"); - public final URI temporal_relation = createProperty(NS, "temporal_relation"); + public final IRI after = createProperty(NS, "after"); + public final IRI before = createProperty(NS, "before"); + public final IRI between = createProperty(NS, "between"); + public final IRI during = createProperty(NS, "during"); + public final IRI finishes = createProperty(NS, "finishes"); + public final IRI immediately_after = createProperty(NS, "immediately_after"); + public final IRI immediately_before = createProperty(NS, "immediately_before"); + public final IRI overlap = createProperty(NS, "overlap"); + public final IRI preceeds = createProperty(NS, "preceeds"); + public final IRI starts = createProperty(NS, "starts"); + public final IRI temporal_relation = createProperty(NS, "temporal_relation"); private LKIFCoreTime() { super(NS); http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java index 2f5fcc5..3b2897f 100644 --- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java +++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreTimeModification.java @@ -16,7 +16,7 @@ */ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core";>lkif-core</a> @@ -53,66 +53,66 @@ public class LKIFCoreTimeModification extends Vocabulary { /* http://www.estrellaproject.org/lkif-core/time-modification.owl */ //////////////////////////////////////////////////////////////////// // CLASSES - public final URI Semantic_Annotation = createClass(NS, "Semantic_Annotation"); - public final URI Modification = createClass(NS, "Modification"); - public final URI Transposition = createClass(NS, "Transposition"); - public final URI Ultractivity = createClass(NS, "Ultractivity"); - public final URI Annulment = createClass(NS, "Annulment"); - public final URI End_efficacy = createClass(NS, "End_efficacy"); - public final URI Efficacy_Modification = createClass(NS, "Efficacy_Modification "); - public final URI Modification_of_System = createClass(NS, "Modification_of_System "); - public final URI Dynamic_Temporal_Entity = createClass(NS, "Dynamic_Temporal_Entity "); - public final URI Remaking = createClass(NS, "Remaking "); - public final URI Application = createClass(NS, "Application "); - public final URI Ratification = createClass(NS, "Ratification "); - public final URI Textual_Modification = createClass(NS, "Textual_Modification "); - public final URI Prorogation_in_Force = createClass(NS, "Prorogation_in_Force "); - public final URI Application_Date = createClass(NS, "Application_Date "); - public final URI Retroactivity = createClass(NS, "Retroactivity "); - public final URI Modification_of_Term = createClass(NS, "Modification_of_Term "); - public final URI Efficacy_Interval = createClass(NS, "Efficacy_Interval "); - public final URI Start_Efficacy = createClass(NS, "Start_Efficacy "); - public final URI Substitution = createClass(NS, "Substitution "); - public final URI Temporal_Modification = createClass(NS, "Temporal_Modification "); - public final URI Suspension = createClass(NS, "Suspension "); - public final URI In_Force_Modification = createClass(NS, "In_Force_Modification "); - public final URI Publication_Date = createClass(NS, "Publication_Date "); - public final URI Exception = createClass(NS, "Exception "); - public final URI Modification_of_Meaning = createClass(NS, "Modification_of_Meaning "); - public final URI Static_Temporal_Entity = createClass(NS, "Static_Temporal_Entity "); - public final URI End_in_Force = createClass(NS, "End_in_Force "); - public final URI Start_in_Force = createClass(NS, "Start_in_Force "); - public final URI Integration = createClass(NS, "Integration "); - public final URI Application_Interval = createClass(NS, "Application_Interval "); - public final URI Interpretation = createClass(NS, "Interpretation "); - public final URI Deregulation = createClass(NS, "Deregulation "); - public final URI In_Force_Interval = createClass(NS, "In_Force_Interval "); - public final URI Repeal = createClass(NS, "Repeal "); - public final URI Modification_of_Scope = createClass(NS, "Modification_of_Scope "); - public final URI Delivery_Date = createClass(NS, "Delivery_Date "); - public final URI Enter_in_Force_Date = createClass(NS, "Enter_in_Force_Date "); - public final URI Variation = createClass(NS, "Variation "); - public final URI Existence_Date = createClass(NS, "Existence_Date "); - public final URI Relocation = createClass(NS, "Relocation "); - public final URI Prorogation_Efficacy = createClass(NS, "Prorogation_Efficacy "); - public final URI Extension = createClass(NS, "Extension "); - public final URI Renewal = createClass(NS, "Renewal "); + public final IRI Semantic_Annotation = createClass(NS, "Semantic_Annotation"); + public final IRI Modification = createClass(NS, "Modification"); + public final IRI Transposition = createClass(NS, "Transposition"); + public final IRI Ultractivity = createClass(NS, "Ultractivity"); + public final IRI Annulment = createClass(NS, "Annulment"); + public final IRI End_efficacy = createClass(NS, "End_efficacy"); + public final IRI Efficacy_Modification = createClass(NS, "Efficacy_Modification "); + public final IRI Modification_of_System = createClass(NS, "Modification_of_System "); + public final IRI Dynamic_Temporal_Entity = createClass(NS, "Dynamic_Temporal_Entity "); + public final IRI Remaking = createClass(NS, "Remaking "); + public final IRI Application = createClass(NS, "Application "); + public final IRI Ratification = createClass(NS, "Ratification "); + public final IRI Textual_Modification = createClass(NS, "Textual_Modification "); + public final IRI Prorogation_in_Force = createClass(NS, "Prorogation_in_Force "); + public final IRI Application_Date = createClass(NS, "Application_Date "); + public final IRI Retroactivity = createClass(NS, "Retroactivity "); + public final IRI Modification_of_Term = createClass(NS, "Modification_of_Term "); + public final IRI Efficacy_Interval = createClass(NS, "Efficacy_Interval "); + public final IRI Start_Efficacy = createClass(NS, "Start_Efficacy "); + public final IRI Substitution = createClass(NS, "Substitution "); + public final IRI Temporal_Modification = createClass(NS, "Temporal_Modification "); + public final IRI Suspension = createClass(NS, "Suspension "); + public final IRI In_Force_Modification = createClass(NS, "In_Force_Modification "); + public final IRI Publication_Date = createClass(NS, "Publication_Date "); + public final IRI Exception = createClass(NS, "Exception "); + public final IRI Modification_of_Meaning = createClass(NS, "Modification_of_Meaning "); + public final IRI Static_Temporal_Entity = createClass(NS, "Static_Temporal_Entity "); + public final IRI End_in_Force = createClass(NS, "End_in_Force "); + public final IRI Start_in_Force = createClass(NS, "Start_in_Force "); + public final IRI Integration = createClass(NS, "Integration "); + public final IRI Application_Interval = createClass(NS, "Application_Interval "); + public final IRI Interpretation = createClass(NS, "Interpretation "); + public final IRI Deregulation = createClass(NS, "Deregulation "); + public final IRI In_Force_Interval = createClass(NS, "In_Force_Interval "); + public final IRI Repeal = createClass(NS, "Repeal "); + public final IRI Modification_of_Scope = createClass(NS, "Modification_of_Scope "); + public final IRI Delivery_Date = createClass(NS, "Delivery_Date "); + public final IRI Enter_in_Force_Date = createClass(NS, "Enter_in_Force_Date "); + public final IRI Variation = createClass(NS, "Variation "); + public final IRI Existence_Date = createClass(NS, "Existence_Date "); + public final IRI Relocation = createClass(NS, "Relocation "); + public final IRI Prorogation_Efficacy = createClass(NS, "Prorogation_Efficacy "); + public final IRI Extension = createClass(NS, "Extension "); + public final IRI Renewal = createClass(NS, "Renewal "); // RESOURCES // PROPERTIES - public final URI initial_date = createProperty(NS, "initial_date"); - public final URI in_force = createProperty(NS, "in_force"); - public final URI final_date_of = createProperty(NS, "final_date_of"); - public final URI efficacy = createProperty(NS, "efficacy"); - public final URI initial_date_of = createProperty(NS, "initial_date_of"); - public final URI produce_efficacy_modification = createProperty(NS, "produce_efficacy_modification"); - public final URI duration = createProperty(NS, "duration"); - public final URI final_date = createProperty(NS, "final_date"); - public final URI application = createProperty(NS, "application"); - public final URI date = createProperty(NS, "date"); - public final URI produce_textual_modification = createProperty(NS, "produce_textual_modification"); - public final URI produce_inforce_modification = createProperty(NS, "produce_inforce_modification"); + public final IRI initial_date = createProperty(NS, "initial_date"); + public final IRI in_force = createProperty(NS, "in_force"); + public final IRI final_date_of = createProperty(NS, "final_date_of"); + public final IRI efficacy = createProperty(NS, "efficacy"); + public final IRI initial_date_of = createProperty(NS, "initial_date_of"); + public final IRI produce_efficacy_modification = createProperty(NS, "produce_efficacy_modification"); + public final IRI duration = createProperty(NS, "duration"); + public final IRI final_date = createProperty(NS, "final_date"); + public final IRI application = createProperty(NS, "application"); + public final IRI date = createProperty(NS, "date"); + public final IRI produce_textual_modification = createProperty(NS, "produce_textual_modification"); + public final IRI produce_inforce_modification = createProperty(NS, "produce_inforce_modification"); private LKIFCoreTimeModification() { super(NS); http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java index a207be4..c0a7266 100644 --- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java +++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreTop.java @@ -16,7 +16,7 @@ */ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core";>lkif-core</a> @@ -50,12 +50,12 @@ public class LKIFCoreTop extends Vocabulary { /* http://www.estrellaproject.org/lkif-core/lkif-top.owl */ ///////////////////////////////////////////////////////////// // CLASSES - public final URI Abstract_Entity = createClass(NS, "Abstract_Entity"); - public final URI Mental_Entity = createClass(NS, "Mental_Entity"); - public final URI Mental_Object = createClass(NS, "Mental_Object"); - public final URI Occurrence = createClass(NS, "Occurrence"); - public final URI Physical_Entity = createClass(NS, "Physical_Entity"); - public final URI Spatio_Temporal_Occurrence = createClass(NS, "Spatio_Temporal_Occurrence"); + public final IRI Abstract_Entity = createClass(NS, "Abstract_Entity"); + public final IRI Mental_Entity = createClass(NS, "Mental_Entity"); + public final IRI Mental_Object = createClass(NS, "Mental_Object"); + public final IRI Occurrence = createClass(NS, "Occurrence"); + public final IRI Physical_Entity = createClass(NS, "Physical_Entity"); + public final IRI Spatio_Temporal_Occurrence = createClass(NS, "Spatio_Temporal_Occurrence"); // RESOURCES http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/OGP.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/OGP.java b/api/src/main/java/org/apache/any23/vocab/OGP.java index 7b3f159..dde75bb 100644 --- a/api/src/main/java/org/apache/any23/vocab/OGP.java +++ b/api/src/main/java/org/apache/any23/vocab/OGP.java @@ -17,7 +17,7 @@ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * The <a href="http://ogp.me/";>Open Graph Protocol</a> vocabulary. @@ -104,41 +104,41 @@ public class OGP extends Vocabulary { return instance; } - public final URI NAMESPACE = createURI(NS); + public final IRI NAMESPACE = createIRI(NS); - public final URI title = createProperty(TITLE); - public final URI type = createProperty(TYPE); - public final URI url = createProperty(URL); - public final URI image = createProperty(IMAGE); - public final URI description = createProperty(DESCRIPTION); - public final URI determiner = createProperty(DETERMINER); - public final URI locale = createProperty(LOCALE); - public final URI localeAlternate = createProperty(LOCALE__ALTERNATE); - public final URI siteName = createProperty(SITE_NAME); - public final URI video = createProperty(VIDEO); - - public final URI imageURL = createProperty(IMAGE__URL); - public final URI imageSecureURL = createProperty(IMAGE__SECURE_URL); - public final URI imageType = createProperty(IMAGE__TYPE); - public final URI imageWidth = createProperty(IMAGE__WIDTH); - public final URI imageHeight = createProperty(IMAGE__HEIGHT); - - public final URI videoURL = createProperty(VIDEO__URL); - public final URI videoSecureURL = createProperty(VIDEO__SECURE_URL); - public final URI videoType = createProperty(VIDEO__TYPE); - public final URI videoWidth = createProperty(VIDEO__WIDTH); - public final URI videoHeight = createProperty(VIDEO__HEIGHT); - - public final URI audio = createProperty(AUDIO); - public final URI audioSecureURL = createProperty(AUDIO__SECURE_URL); - public final URI audioType = createProperty(AUDIO__TYPE); - - private URI createClass(String localName) { + public final IRI title = createProperty(TITLE); + public final IRI type = createProperty(TYPE); + public final IRI url = createProperty(URL); + public final IRI image = createProperty(IMAGE); + public final IRI description = createProperty(DESCRIPTION); + public final IRI determiner = createProperty(DETERMINER); + public final IRI locale = createProperty(LOCALE); + public final IRI localeAlternate = createProperty(LOCALE__ALTERNATE); + public final IRI siteName = createProperty(SITE_NAME); + public final IRI video = createProperty(VIDEO); + + public final IRI imageURL = createProperty(IMAGE__URL); + public final IRI imageSecureURL = createProperty(IMAGE__SECURE_URL); + public final IRI imageType = createProperty(IMAGE__TYPE); + public final IRI imageWidth = createProperty(IMAGE__WIDTH); + public final IRI imageHeight = createProperty(IMAGE__HEIGHT); + + public final IRI videoURL = createProperty(VIDEO__URL); + public final IRI videoSecureURL = createProperty(VIDEO__SECURE_URL); + public final IRI videoType = createProperty(VIDEO__TYPE); + public final IRI videoWidth = createProperty(VIDEO__WIDTH); + public final IRI videoHeight = createProperty(VIDEO__HEIGHT); + + public final IRI audio = createProperty(AUDIO); + public final IRI audioSecureURL = createProperty(AUDIO__SECURE_URL); + public final IRI audioType = createProperty(AUDIO__TYPE); + + private IRI createClass(String localName) { return createClass(NS, localName); } - private URI createProperty(String localName) { + private IRI createProperty(String localName) { return createProperty(NS, localName); } http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/Programme.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/Programme.java b/api/src/main/java/org/apache/any23/vocab/Programme.java index 1a599e2..7d23254 100644 --- a/api/src/main/java/org/apache/any23/vocab/Programme.java +++ b/api/src/main/java/org/apache/any23/vocab/Programme.java @@ -16,7 +16,7 @@ */ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * <p>The <a href="http://purl.org/ontology/po/";>Programmes Ontology</a> is aimed @@ -42,86 +42,86 @@ public class Programme extends Vocabulary { //Resources /** A version holding an audio description. */ - public final URI AudioDescribedVersion = createClass(NS, "AudioDescribedVersion"); + public final IRI AudioDescribedVersion = createClass(NS, "AudioDescribedVersion"); /** A brand, e.g. `Top Gea`r*/ - public final URI Brand = createClass(NS, "Brand"); + public final IRI Brand = createClass(NS, "Brand"); /** * A broadcast event. Subsumes the event concept defined in the Event ontology. * A broadcast is associated with a service, and with a particular version of an episode. */ - public final URI Broadcast = createClass(NS, "Broadcast"); + public final IRI Broadcast = createClass(NS, "Broadcast"); /** An organization responsible of some broadcasting services. * It can hold a set of services and outlets. */ - public final URI Broadcaster = createClass(NS, "Broadcaster"); + public final IRI Broadcaster = createClass(NS, "Broadcaster"); /** A category provides a way of classifying a set of programmes. * Such classifications can be performed according to multiple * dimensions and taxonomies, e.g. genre, format, places, people, subjects... */ - public final URI Category = createClass(NS, "Category"); + public final IRI Category = createClass(NS, "Category"); /** A physical channel on which a broadcast occurs. * A single outlet or service can be associated with multiple channels. * For example, Radio 4 LW broadcasts on Analogue Long Wave and on Digital * Satellite. */ - public final URI Channel = createClass(NS, "Channel"); + public final IRI Channel = createClass(NS, "Channel"); /** A particular clip, e.g. `Clip of Top Gear, first series' */ - public final URI Clip = createClass(NS, "Clip"); + public final IRI Clip = createClass(NS, "Clip"); /** * Digital Audio Broadcasting */ - public final URI DAB = createClass(NS, "DAB"); + public final IRI DAB = createClass(NS, "DAB"); /** Digital Video Broadcasting*/ - public final URI DVB = createClass(NS, "DVB"); + public final IRI DVB = createClass(NS, "DVB"); /** * A particular episode, e.g. `Top Gear, first episode of the first series' * or the film 'A Walk in the Sun' (http://www.bbc.co.uk/programmes/b00gfzdt) */ - public final URI Episode = createClass(NS, "Episode"); + public final IRI Episode = createClass(NS, "Episode"); /** The FM broadcast band */ - public final URI FM = createClass(NS, "FM"); + public final IRI FM = createClass(NS, "FM"); /** Specifies a broadcast as being the first one of a particular version.*/ - public final URI FirstBroadcast = createClass(NS, "FirstBroadcast"); + public final IRI FirstBroadcast = createClass(NS, "FirstBroadcast"); /** * Anchor point for format taxonomies, similar to po:Genre for genre taxonomies. * Instances of this concept include documentaries, talk shows, animation, etc. */ - public final URI Format = createClass(NS, "Format"); + public final IRI Format = createClass(NS, "Format"); /** * An anchor point for a programmes' genre taxonomy, # * e.g. 'Drama'/'Biographical'.*/ - public final URI Genre = createClass(NS, "Genre"); + public final IRI Genre = createClass(NS, "Genre"); /** IP Stream*/ - public final URI IPStream = createClass(NS, "IPStream"); + public final IRI IPStream = createClass(NS, "IPStream"); /** The AM broadcast band.*/ - public final URI LW = createClass(NS, "LW"); + public final IRI LW = createClass(NS, "LW"); /** Radio services aiming at a local coverage.*/ - public final URI LocalRadio = createClass(NS, "LocalRadio"); + public final IRI LocalRadio = createClass(NS, "LocalRadio"); /** Classification of an episode version's region corresponding to a * musical track being played..*/ - public final URI MusicSegment = createClass(NS, "MusicSegment"); + public final IRI MusicSegment = createClass(NS, "MusicSegment"); /** Radio services aiming at a national coverage.*/ - public final URI NationalRadio = createClass(NS, "NationalRadio"); + public final IRI NationalRadio = createClass(NS, "NationalRadio"); /** An `original' version, the legacy version of a particular episode.*/ - public final URI OriginalVersion = createClass(NS, "OriginalVersion"); + public final IRI OriginalVersion = createClass(NS, "OriginalVersion"); /** Outlet of a particular service, e.g. Radio 4 LW and FM for Radio 4. * Outlets are services which do not have variations. The identity criteria @@ -129,39 +129,39 @@ public class Programme extends Vocabulary { * Analogue Long Wave, but also on Digital Satellite. It corresponds to just * one outlet, as they are simulcasts. The two physical channels for * broadcasts correspond to po:Channel.*/ - public final URI Outlet = createClass(NS, "Outlet"); + public final IRI Outlet = createClass(NS, "Outlet"); /** A Person.*/ - public final URI Person = createClass(NS, "Person"); + public final IRI Person = createClass(NS, "Person"); /** A physical place.*/ - public final URI Place = createClass(NS, "Place"); + public final IRI Place = createClass(NS, "Place"); /** A programme, can either be a brand, a series or an episode.*/ - public final URI Programme = createClass(NS, "Programme"); + public final IRI Programme = createClass(NS, "Programme"); /** A programme that can have versions, and as such can be broadcast or * made available on-demand, e.g. a clip or an episode.*/ - public final URI ProgrammeItem = createClass(NS, "ProgrammeItem"); + public final IRI ProgrammeItem = createClass(NS, "ProgrammeItem"); /** Services that use a radio medium.*/ - public final URI Radio = createClass(NS, "Radio"); + public final IRI Radio = createClass(NS, "Radio"); /** Radio services aiming at a regional coverage.*/ - public final URI RegionalRadio = createClass(NS, "RegionalRadio"); + public final IRI RegionalRadio = createClass(NS, "RegionalRadio"); /** Specifies a broadcast as being a repeat.*/ - public final URI RepeatBroadcast = createClass(NS, "RepeatBroadcast"); + public final IRI RepeatBroadcast = createClass(NS, "RepeatBroadcast"); /** A season is a group of broadcasts.*/ - public final URI Season = createClass(NS, "Season"); + public final IRI Season = createClass(NS, "Season"); /** Classification of an episode version's region, e.g. * 'this track was played at that time'.*/ - public final URI Segment = createClass(NS, "Segment"); + public final IRI Segment = createClass(NS, "Segment"); /** A series, e.g. `Top Gear, first season'*/ - public final URI Series = createClass(NS, "Series"); + public final IRI Series = createClass(NS, "Series"); /** A broadcasting service. Instances of this concept include BBC Radio Wales, * BBC Radio 4, BBC News, etc. A service is a collection of outlets which @@ -171,200 +171,200 @@ public class Programme extends Vocabulary { * defined within this ontology, e.g. radio and TV. A service that is a master * brand only (a service that only commissions programmes, e.g. BBC Switch) should * be an instance of the top-level po:Service.*/ - public final URI Service = createClass(NS, "Service"); + public final IRI Service = createClass(NS, "Service"); /** A shortened version.*/ - public final URI ShortenedVersion = createClass(NS, "ShortenedVersion"); + public final IRI ShortenedVersion = createClass(NS, "ShortenedVersion"); /** Classification of an episode version's region holding speech content.*/ - public final URI SpeechSegment = createClass(NS, "SpeechSegment"); + public final IRI SpeechSegment = createClass(NS, "SpeechSegment"); /** Anchor point for subject taxonomies.*/ - public final URI SignedVersion = createClass(NS, "SignedVersion"); + public final IRI SignedVersion = createClass(NS, "SignedVersion"); /** A version holding sign language.*/ - public final URI Subject = createClass(NS, "Subject"); + public final IRI Subject = createClass(NS, "Subject"); /** Classification of an episode version's region corresponding to a subtitle being shown. */ - public final URI Subtitle = createClass(NS, "Subtitle"); + public final IRI Subtitle = createClass(NS, "Subtitle"); /** Services that use a television medium.*/ - public final URI TV = createClass(NS, "TV"); + public final IRI TV = createClass(NS, "TV"); /** A particular version of an episode. * Such versions include shortened ones, audio described ones * or ones that holds sign language. * The version is associated to a timeline.*/ - public final URI Version = createClass(NS, "Version"); + public final IRI Version = createClass(NS, "Version"); /** Services that use a Web medium.*/ - public final URI Web = createClass(NS, "Web"); + public final IRI Web = createClass(NS, "Web"); //Properties /** Relates a programmes to one of its actors - a person who plays the * role of a character. */ - public final URI actor = createProperty(NS, "actor"); + public final IRI actor = createProperty(NS, "actor"); /** A television reporter who coordinates a programme. */ - public final URI anchor = createProperty(NS, "anchor"); + public final IRI anchor = createProperty(NS, "anchor"); /** The aspect ration of a particular version.*/ - public final URI aspect_ratio = createProperty(NS, "aspect_ratio"); + public final IRI aspect_ratio = createProperty(NS, "aspect_ratio"); /** Relates a programme to its author - the person who created the content */ - public final URI author = createProperty(NS, "author"); + public final IRI author = createProperty(NS, "author"); /** Relates a particular broadcast to the version being broadcasted. * Sub-property of the event:factor one.*/ - public final URI broadcast_of = createProperty(NS, "broadcast_of"); + public final IRI broadcast_of = createProperty(NS, "broadcast_of"); /** Relates a particular broadcast to the service or outlet on which it was on. * Sub-property of the event:factor one. */ - public final URI broadcast_on = createProperty(NS, "broadcast_on"); + public final IRI broadcast_on = createProperty(NS, "broadcast_on"); /** Associates a service to a broadcaster. */ - public final URI broadcaster = createProperty(NS, "broadcaster"); + public final IRI broadcaster = createProperty(NS, "broadcaster"); /** Relates a programme to a particular category, e.g. genre, format, place...*/ - public final URI category = createProperty(NS, "category"); + public final IRI category = createProperty(NS, "category"); /** Associates a service to a channel, e.g. Radio 4 LW to Radio 4 LW on * Analogue Long Wave.*/ - public final URI channel = createProperty(NS, "channel"); + public final IRI channel = createProperty(NS, "channel"); /** Associates a brand, a series or an episode to a clip.*/ - public final URI clip = createProperty(NS, "clip"); + public final IRI clip = createProperty(NS, "clip"); /** Relates a programme to one of its commentators */ - public final URI commentator = createProperty(NS, "commentator"); + public final IRI commentator = createProperty(NS, "commentator"); /** Relates a programmes to a person who is credited in it */ - public final URI credit = createProperty(NS, "credit"); + public final IRI credit = createProperty(NS, "credit"); /** Relates a programme to its supervisor. Generally refers to the person * responsible for all audience-visible components of a program, film, or show, * whereas the producer is responsible for the financial and other * behind-the-scenes aspects. A director's duties might also include casting, * script editing, shot selection, shot composition, and editing */ - public final URI director = createProperty(NS, "director"); + public final IRI director = createProperty(NS, "director"); /** The duration of a version, in seconds. */ - public final URI duration = createProperty(NS, "duration"); + public final IRI duration = createProperty(NS, "duration"); /** Associates a brand or a series to an episode constituting it.*/ - public final URI episode = createProperty(NS, "episode"); + public final IRI episode = createProperty(NS, "episode"); /** Relates a programme to its executive producer - a producer who is not involved * in any technical aspects of the making process, but who is still responsible * for the overall production. Typically an executive producer handles business and * legal issues */ - public final URI executive_producer = createProperty(NS, "executive_producer"); + public final IRI executive_producer = createProperty(NS, "executive_producer"); /** Relates a programme to a particular format (eg. `Animation', `Documentary', etc.).*/ - public final URI format = createProperty(NS, "format"); + public final IRI format = createProperty(NS, "format"); /** Associates a channel to its frequency */ - public final URI frequency = createProperty(NS, "frequency"); + public final IRI frequency = createProperty(NS, "frequency"); /** Relates a programme to a particular genre.*/ - public final URI genre = createProperty(NS, "genre"); + public final IRI genre = createProperty(NS, "genre"); /** Associates a service to a geographic location, aiming at capturing what * this service aims at covering.*/ - public final URI location = createProperty(NS, "location"); + public final IRI location = createProperty(NS, "location"); /** A long synopsis of a serie, brand or episode. Sub-property of po:synopsis.*/ - public final URI long_synopsis = createProperty(NS, "long_synopsis"); + public final IRI long_synopsis = createProperty(NS, "long_synopsis"); /** Associates a programme with its masterbrand (its commissionner) */ - public final URI masterbrand = createProperty(NS, "masterbrand"); + public final IRI masterbrand = createProperty(NS, "masterbrand"); /** A medium synopsis of a serie, brand or episode. Sub-property of po:synopsis.*/ - public final URI medium_synopsis = createProperty(NS, "medium_synopsis"); + public final IRI medium_synopsis = createProperty(NS, "medium_synopsis"); /** Associates a programme to its microsite. For example * http://www.bbc.co.uk/programmes/b00fm04s and http://www.bbc.co.uk/eastenders/ */ - public final URI microsite = createProperty(NS, "microsite"); + public final IRI microsite = createProperty(NS, "microsite"); /** Relates a programme to its news reader */ - public final URI news_reader = createProperty(NS, "news_reader"); + public final IRI news_reader = createProperty(NS, "news_reader"); /** Associates a service to an outlet, e.g. Radio 4 to Radio 4 LW.*/ - public final URI outlet = createProperty(NS, "outlet"); + public final IRI outlet = createProperty(NS, "outlet"); /** Relates a series to a series constituting it (eg. `Waking the dead').*/ - public final URI parent_series = createProperty(NS, "parent_series"); + public final IRI parent_series = createProperty(NS, "parent_series"); /** Relates a service to another service encapsulating it (eg. `BBC One' and `BBC One South')*/ - public final URI parent_service = createProperty(NS, "parent_service"); + public final IRI parent_service = createProperty(NS, "parent_service"); /** Relates a programme to one of its participants */ - public final URI participant = createProperty(NS, "participant"); + public final IRI participant = createProperty(NS, "participant"); /** Relates a programme to an entertainer who performs a dramatic or musical work for audience */ - public final URI performer = createProperty(NS, "performer"); + public final IRI performer = createProperty(NS, "performer"); /** Relates a programme to a person*/ - public final URI person = createProperty(NS, "person"); + public final IRI person = createProperty(NS, "person"); /** Relates a programme to a place (e.g. `London')*/ - public final URI place = createProperty(NS, "place"); + public final IRI place = createProperty(NS, "place"); /** The position of a particular series or episode within its containing programme. * This property can also be used to give the position of an interval * within the containing timeline. */ - public final URI position = createProperty(NS, "position"); + public final IRI position = createProperty(NS, "position"); /** Relates a programme to its producer - the manager of an event, show, * or other work, usually the individual in charge of finance, personnel, * and other non-artistic aspects in the development of commercials, * plays, movies, and other works */ - public final URI producer = createProperty(NS, "producer"); + public final IRI producer = createProperty(NS, "producer"); /** The schedule date of a broadcast event.*/ - public final URI schedule_date = createProperty(NS, "schedule_date"); + public final IRI schedule_date = createProperty(NS, "schedule_date"); /** Associates a season to its constituent broadcasts */ - public final URI season_broadcast = createProperty(NS, "season_broadcast"); + public final IRI season_broadcast = createProperty(NS, "season_broadcast"); /** Associates a brand or a series to a series constituting it.*/ - public final URI series = createProperty(NS, "series"); + public final IRI series = createProperty(NS, "series"); /** Associate a brand, series or episode to the master brand service.*/ - public final URI service = createProperty(NS, "service"); + public final IRI service = createProperty(NS, "service"); /** A short synopsis of a serie, brand or episode. Sub-property of po:synopsis.*/ - public final URI short_synopsis = createProperty(NS, "short_synopsis"); + public final IRI short_synopsis = createProperty(NS, "short_synopsis"); /** The sound format of a particular version.*/ - public final URI sound_format = createProperty(NS, "sound_format"); + public final IRI sound_format = createProperty(NS, "sound_format"); /** Relates a programme to a subject (e.g. `easter').*/ - public final URI subject = createProperty(NS, "subject"); + public final IRI subject = createProperty(NS, "subject"); /** Language of the subtitles emebedded in a particular version.*/ - public final URI subtitle_language = createProperty(NS, "subtitle_language"); + public final IRI subtitle_language = createProperty(NS, "subtitle_language"); /** The synopsis of a serie, brand or episode.*/ - public final URI synopsis = createProperty(NS, "synopsis"); + public final IRI synopsis = createProperty(NS, "synopsis"); /** Associates an episode to a particular tag. */ - public final URI tag = createProperty(NS, "tag"); + public final IRI tag = createProperty(NS, "tag"); /** Associates a subtitle event to the corresponding text. */ - public final URI text = createProperty(NS, "text"); + public final IRI text = createProperty(NS, "text"); /** Associates an episode's version or a version's segment with a temporal interval. * This interval can be associated with a timeline, serving as an anchor for * further temporal annotations, e.g. subtitles or played track.*/ - public final URI time = createProperty(NS, "time"); + public final IRI time = createProperty(NS, "time"); /** Associates a music segment with a track, as defined in MO. */ - public final URI track = createProperty(NS, "track"); + public final IRI track = createProperty(NS, "track"); /** Associate an episode to a version of it. Different versions of a same * episode can exist (shortened version, version designed for the hearing impaired, etc.). */ - public final URI version = createProperty(NS, "version"); + public final IRI version = createProperty(NS, "version"); private Programme(){ super(NS); http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/Review.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/Review.java b/api/src/main/java/org/apache/any23/vocab/Review.java index fec466c..d4d82b3 100644 --- a/api/src/main/java/org/apache/any23/vocab/Review.java +++ b/api/src/main/java/org/apache/any23/vocab/Review.java @@ -17,7 +17,7 @@ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Vocabulary definitions from vocabularies/review.rdf @@ -39,91 +39,91 @@ public class Review extends Vocabulary { public static final String NS = "http://purl.org/stuff/rev#";; /** - * The namespace of the vocabulary as a URI. + * The namespace of the vocabulary as a IRI. */ - public final URI NAMESPACE = createURI(NS); + public final IRI NAMESPACE = createIRI(NS); /** * The commenter on the review. */ - public final URI commenter = createProperty("commenter"); + public final IRI commenter = createProperty("commenter"); /** * Used to associate a review with a comment on the review. */ - public final URI hasComment = createProperty("hasComment"); + public final IRI hasComment = createProperty("hasComment"); /** * Associates a review with a feedback on the review. */ - public final URI hasFeedback = createProperty("hasFeedback"); + public final IRI hasFeedback = createProperty("hasFeedback"); /** * Associates a work with a a review. */ - public final URI hasReview = createProperty("hasReview"); + public final IRI hasReview = createProperty("hasReview"); /** * A numeric value. */ - public final URI maxRating = createProperty("maxRating"); + public final IRI maxRating = createProperty("maxRating"); /** * A numeric value. */ - public final URI minRating = createProperty("minRating"); + public final IRI minRating = createProperty("minRating"); /** * Number of positive usefulness votes (integer). */ - public final URI positiveVotes = createProperty("positiveVotes"); + public final IRI positiveVotes = createProperty("positiveVotes"); /** * A numeric value. */ - public final URI rating = createProperty("rating"); + public final IRI rating = createProperty("rating"); /** * The person that has written the review. */ - public final URI reviewer = createProperty("reviewer"); + public final IRI reviewer = createProperty("reviewer"); /** * The text of the review. */ - public final URI text = createProperty("text"); + public final IRI text = createProperty("text"); /** * The title of the review. */ - public final URI title = createProperty("title"); + public final IRI title = createProperty("title"); /** * Number of usefulness votes (integer). */ - public final URI totalVotes = createProperty("totalVotes"); + public final IRI totalVotes = createProperty("totalVotes"); /** * The type of media of a work under review. */ - public final URI type = createProperty("type"); + public final IRI type = createProperty("type"); /** * A comment on a review. */ - public final URI Comment = createProperty("Comment"); + public final IRI Comment = createProperty("Comment"); /** * Feedback on the review. Expresses whether the review was useful or not. */ - public final URI Feedback = createProperty("Feedback"); + public final IRI Feedback = createProperty("Feedback"); /** * A review of an work. */ - public final URI Review = createProperty("Review"); + public final IRI Review = createProperty("Review"); - private URI createProperty(String localName) { + private IRI createProperty(String localName) { return createProperty(NS, localName); } http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/ReviewAggregate.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/ReviewAggregate.java b/api/src/main/java/org/apache/any23/vocab/ReviewAggregate.java index a6f505c..3300523 100644 --- a/api/src/main/java/org/apache/any23/vocab/ReviewAggregate.java +++ b/api/src/main/java/org/apache/any23/vocab/ReviewAggregate.java @@ -17,7 +17,7 @@ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; public class ReviewAggregate extends Vocabulary { private static ReviewAggregate instance; @@ -35,36 +35,36 @@ public class ReviewAggregate extends Vocabulary { public static final String NS = "http://purl.org/stuff/revagg#";; /** - * The namespace of the vocabulary as a URI. + * The namespace of the vocabulary as a IRI. */ - public final URI NAMESPACE = createURI(NS); + public final IRI NAMESPACE = createIRI(NS); /** * Number of usefulness votes (integer). */ - public final URI votes = createProperty("votes"); + public final IRI votes = createProperty("votes"); /** * Number of usefulness reviews (integer). */ - public final URI count = createProperty("count"); + public final IRI count = createProperty("count"); /** * Optional */ - public final URI average = createProperty("average"); + public final IRI average = createProperty("average"); - public final URI worst = createProperty("worst"); + public final IRI worst = createProperty("worst"); - public final URI best = createProperty("best"); + public final IRI best = createProperty("best"); /** * An agg review of a work. */ - public final URI ReviewAggregate = createProperty("ReviewAggregate"); + public final IRI ReviewAggregate = createProperty("ReviewAggregate"); - private URI createProperty(String localName) { + private IRI createProperty(String localName) { return createProperty(NS, localName); } http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/SINDICE.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/SINDICE.java b/api/src/main/java/org/apache/any23/vocab/SINDICE.java index 8c5e9cf..68c8d5a 100644 --- a/api/src/main/java/org/apache/any23/vocab/SINDICE.java +++ b/api/src/main/java/org/apache/any23/vocab/SINDICE.java @@ -17,7 +17,7 @@ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * This class models an internal <i>Sindice</i> Vocabulary to describe @@ -56,50 +56,50 @@ public class SINDICE extends Vocabulary { } /** - * The namespace of the vocabulary as a URI. + * The namespace of the vocabulary as a IRI. */ - public final URI NAMESPACE = createURI(NS); + public final IRI NAMESPACE = createIRI(NS); /** * This property expresses the DNS domain of the resource on which * it is applied. It is intended to be used to keep track of the domain provenance * of each resource. */ - public final URI domain = createProperty(DOMAIN); + public final IRI domain = createProperty(DOMAIN); /** * This property links a resource with a <i>blank node</i> that represents * a nested <i>Microformat</i> node. */ - public final URI nesting = createProperty(NESTING); + public final IRI nesting = createProperty(NESTING); /** * This property is used to keep track of the original nested <i>RDF property</i>. */ - public final URI nesting_original = createProperty(NESTING_ORIGINAL); + public final IRI nesting_original = createProperty(NESTING_ORIGINAL); /** * This property links the resource with a <i>node</i> representing the nested <i>Microformat</i> * */ - public final URI nesting_structured = createProperty(NESTING_STRUCTURED); + public final IRI nesting_structured = createProperty(NESTING_STRUCTURED); /** * Size meta property indicating the number of triples within the returned dataset. */ - public final URI size = createProperty(SIZE); + public final IRI size = createProperty(SIZE); /** * Date meta property indicating the data generation time. */ - public final URI date = createProperty(DATE); + public final IRI date = createProperty(DATE); - private URI createClass(String localName) { + private IRI createClass(String localName) { return createClass(NS, localName); } - private URI createProperty(String localName) { + private IRI createProperty(String localName) { return createProperty(NS, localName); } http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/VCard.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/VCard.java b/api/src/main/java/org/apache/any23/vocab/VCard.java index 10d3c94..d6cd698 100644 --- a/api/src/main/java/org/apache/any23/vocab/VCard.java +++ b/api/src/main/java/org/apache/any23/vocab/VCard.java @@ -17,7 +17,7 @@ package org.apache.any23.vocab; -import org.openrdf.model.URI; +import org.eclipse.rdf4j.model.IRI; /** * Vocabulary definitions from vcard.owl @@ -39,321 +39,321 @@ public class VCard extends Vocabulary { } /** - * The namespace of the vocabulary as a URI. + * The namespace of the vocabulary as a IRI. */ - public final URI NAMESPACE = createURI(NS); + public final IRI NAMESPACE = createIRI(NS); /** * An additional part of a person's name. */ - public final URI additional_name = createProperty("additional-name"); + public final IRI additional_name = createProperty("additional-name"); /** * A postal or street address of a person. */ - public final URI adr = createProperty("adr"); + public final IRI adr = createProperty("adr"); /** * A person that acts as one's agent. */ - public final URI agent = createProperty("agent"); + public final IRI agent = createProperty("agent"); /** * The altitude of a geographic location. */ - public final URI altitude = createProperty("altitude"); + public final IRI altitude = createProperty("altitude"); /** * The birthday of a person. */ - public final URI bday = createProperty("bday"); + public final IRI bday = createProperty("bday"); /** * A category of a vCard. */ - public final URI category = createProperty("category"); + public final IRI category = createProperty("category"); /** * A class (e.g., public, private, etc.) of a vCard. */ - public final URI class_ = createProperty("class"); + public final IRI class_ = createProperty("class"); /** * The country of a postal address. */ - public final URI country_name = createProperty("country-name"); + public final IRI country_name = createProperty("country-name"); /** * An email address. */ - public final URI email = createProperty("email"); + public final IRI email = createProperty("email"); /** * The extended address of a postal address. */ - public final URI extended_address = createProperty("extended-address"); + public final IRI extended_address = createProperty("extended-address"); /** * A family name part of a person's name. */ - public final URI family_name = createProperty("family-name"); + public final IRI family_name = createProperty("family-name"); /** * A fax number of a person. */ - public final URI fax = createProperty("fax"); + public final IRI fax = createProperty("fax"); /** * A formatted name of a person. */ - public final URI fn = createProperty("fn"); + public final IRI fn = createProperty("fn"); /** * A geographic location associated with a person. */ - public final URI geo = createProperty("geo"); + public final IRI geo = createProperty("geo"); /** * A given name part of a person's name. */ - public final URI given_name = createProperty("given-name"); + public final IRI given_name = createProperty("given-name"); /** * A home address of a person. */ - public final URI homeAdr = createProperty("homeAdr"); + public final IRI homeAdr = createProperty("homeAdr"); /** * A home phone number of a person. */ - public final URI homeTel = createProperty("homeTel"); + public final IRI homeTel = createProperty("homeTel"); /** * An honorific prefix part of a person's name. */ - public final URI honorific_prefix = createProperty("honorific-prefix"); + public final IRI honorific_prefix = createProperty("honorific-prefix"); /** * An honorific suffix part of a person's name. */ - public final URI honorific_suffix = createProperty("honorific-suffix"); + public final IRI honorific_suffix = createProperty("honorific-suffix"); /** * A key (e.g, PKI key) of a person. */ - public final URI key = createProperty("key"); + public final IRI key = createProperty("key"); /** * The formatted version of a postal address (a string with embedded line breaks, * punctuation, etc.). */ - public final URI label = createProperty("label"); + public final IRI label = createProperty("label"); /** * The latitude of a geographic location. */ - public final URI latitude = createProperty("latitude"); + public final IRI latitude = createProperty("latitude"); /** * The locality (e.g., city) of a postal address. */ - public final URI locality = createProperty("locality"); + public final IRI locality = createProperty("locality"); /** * A logo associated with a person or their organization. */ - public final URI logo = createProperty("logo"); + public final IRI logo = createProperty("logo"); /** * The longitude of a geographic location. */ - public final URI longitude = createProperty("longitude"); + public final IRI longitude = createProperty("longitude"); /** * A mailer associated with a vCard. */ - public final URI mailer = createProperty("mailer"); + public final IRI mailer = createProperty("mailer"); /** * A mobile email address of a person. */ - public final URI mobileEmail = createProperty("mobileEmail"); + public final IRI mobileEmail = createProperty("mobileEmail"); /** * A mobile phone number of a person. */ - public final URI mobileTel = createProperty("mobileTel"); + public final IRI mobileTel = createProperty("mobileTel"); /** * The components of the name of a person. */ - public final URI n = createProperty("n"); + public final IRI n = createProperty("n"); /** * The nickname of a person. */ - public final URI nickname = createProperty("nickname"); + public final IRI nickname = createProperty("nickname"); /** * Notes about a person on a vCard. */ - public final URI note = createProperty("note"); + public final IRI note = createProperty("note"); /** * An organization associated with a person. */ - public final URI org = createProperty("org"); + public final IRI org = createProperty("org"); /** * The name of an organization. */ - public final URI organization_name = createProperty("organization-name"); + public final IRI organization_name = createProperty("organization-name"); /** * The name of a unit within an organization. */ - public final URI organization_unit = createProperty("organization-unit"); + public final IRI organization_unit = createProperty("organization-unit"); /** * An email address unaffiliated with any particular organization or employer; * a personal email address. */ - public final URI personalEmail = createProperty("personalEmail"); + public final IRI personalEmail = createProperty("personalEmail"); /** * A photograph of a person. */ - public final URI photo = createProperty("photo"); + public final IRI photo = createProperty("photo"); /** * The post office box of a postal address. */ - public final URI post_office_box = createProperty("post-office-box"); + public final IRI post_office_box = createProperty("post-office-box"); /** * The postal code (e.g., U.S. ZIP code) of a postal address. */ - public final URI postal_code = createProperty("postal-code"); + public final IRI postal_code = createProperty("postal-code"); /** * The region (e.g., state or province) of a postal address. */ - public final URI region = createProperty("region"); + public final IRI region = createProperty("region"); /** * The timestamp of a revision of a vCard. */ - public final URI rev = createProperty("rev"); + public final IRI rev = createProperty("rev"); /** * A role a person plays within an organization. */ - public final URI role = createProperty("role"); + public final IRI role = createProperty("role"); /** * A version of a person's name suitable for collation. */ - public final URI sort_string = createProperty("sort-string"); + public final IRI sort_string = createProperty("sort-string"); /** * A sound (e.g., a greeting or pronounciation) of a person. */ - public final URI sound = createProperty("sound"); + public final IRI sound = createProperty("sound"); /** * The street address of a postal address. */ - public final URI street_address = createProperty("street-address"); + public final IRI street_address = createProperty("street-address"); /** * A telephone number of a person. */ - public final URI tel = createProperty("tel"); + public final IRI tel = createProperty("tel"); /** * A person's title. */ - public final URI title = createProperty("title"); + public final IRI title = createProperty("title"); /** * A timezone associated with a person. */ - public final URI tz = createProperty("tz"); + public final IRI tz = createProperty("tz"); /** * A UID of a person's vCard. */ - public final URI uid = createProperty("uid"); + public final IRI uid = createProperty("uid"); /** * An (explicitly) unlabeled address of a person. */ - public final URI unlabeledAdr = createProperty("unlabeledAdr"); + public final IRI unlabeledAdr = createProperty("unlabeledAdr"); /** * An (explicitly) unlabeled email address of a person. */ - public final URI unlabeledEmail = createProperty("unlabeledEmail"); + public final IRI unlabeledEmail = createProperty("unlabeledEmail"); /** * An (explicitly) unlabeled phone number of a person. */ - public final URI unlabeledTel = createProperty("unlabeledTel"); + public final IRI unlabeledTel = createProperty("unlabeledTel"); /** * A URL associated with a person. */ - public final URI url = createProperty("url"); + public final IRI url = createProperty("url"); /** * A work address of a person. */ - public final URI workAdr = createProperty("workAdr"); + public final IRI workAdr = createProperty("workAdr"); /** * A work email address of a person. */ - public final URI workEmail = createProperty("workEmail"); + public final IRI workEmail = createProperty("workEmail"); /** * A work phone number of a person. */ - public final URI workTel = createProperty("workTel"); + public final IRI workTel = createProperty("workTel"); /** * Resources that are vCard (postal) addresses. */ - public final URI Address = createURI("http://www.w3.org/2006/vcard/ns#Address";); + public final IRI Address = createIRI("http://www.w3.org/2006/vcard/ns#Address";); - public final URI addressType = createProperty("addressType"); + public final IRI addressType = createProperty("addressType"); /** * Resources that are vCard Telephones. */ - public final URI Telephone = createURI("http://www.w3.org/2006/vcard/ns#Address";); + public final IRI Telephone = createIRI("http://www.w3.org/2006/vcard/ns#Address";); /** * Resources that are vCard geographic locations. */ - public final URI Location = createURI("http://www.w3.org/2006/vcard/ns#Location";); + public final IRI Location = createIRI("http://www.w3.org/2006/vcard/ns#Location";); /** * Resources that are vCard personal names. */ - public final URI Name = createURI("http://www.w3.org/2006/vcard/ns#Name";); + public final IRI Name = createIRI("http://www.w3.org/2006/vcard/ns#Name";); /** * Resources that are vCard organizations. */ - public final URI Organization = createURI("http://www.w3.org/2006/vcard/ns#Organization";); + public final IRI Organization = createIRI("http://www.w3.org/2006/vcard/ns#Organization";); /** * Resources that are vCards */ - public final URI VCard = createURI("http://www.w3.org/2006/vcard/ns#VCard";); + public final IRI VCard = createIRI("http://www.w3.org/2006/vcard/ns#VCard";); - private URI createProperty(String localName) { + private IRI createProperty(String localName) { return createProperty(NS, localName); } http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/Vocabulary.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/any23/vocab/Vocabulary.java b/api/src/main/java/org/apache/any23/vocab/Vocabulary.java index f34e06b..8c8204f 100644 --- a/api/src/main/java/org/apache/any23/vocab/Vocabulary.java +++ b/api/src/main/java/org/apache/any23/vocab/Vocabulary.java @@ -17,9 +17,8 @@ package org.apache.any23.vocab; -import org.openrdf.model.URI; -import org.openrdf.model.impl.ValueFactoryImpl; - +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.lang.reflect.Field; @@ -52,31 +51,31 @@ public abstract class Vocabulary { /** * Vocabulary namespace. */ - private final URI namespace; + private final IRI namespace; /** * Map of vocabulary resources. */ - private Map<String,URI> classes; + private Map<String,IRI> classes; /** * Map of vocabulary properties. */ - private Map<String,URI> properties; + private Map<String,IRI> properties; /** * Map any resource with the relative comment. */ - private Map<URI,String> resourceToCommentMap; + private Map<IRI,String> resourceToCommentMap; /** * Constructor. * - * @param namespace the namespace URI prefix. + * @param namespace the namespace IRI prefix. */ public Vocabulary(String namespace) { try { - this.namespace = ValueFactoryImpl.getInstance().createURI(namespace); + this.namespace = SimpleValueFactory.getInstance().createIRI(namespace); } catch (Exception e) { throw new IllegalArgumentException("Invalid namespace '" + namespace + "'", e); } @@ -85,7 +84,7 @@ public abstract class Vocabulary { /** * @return the namespace associated to this vocabulary. */ - public URI getNamespace() { + public IRI getNamespace() { return namespace; } @@ -93,10 +92,10 @@ public abstract class Vocabulary { * Returns a class defined within this vocabulary. * * @param name class name. - * @return the URI associated to such resource. + * @return the IRI associated to such resource. */ - public URI getClass(String name) { - URI res = classes.get(name); + public IRI getClass(String name) { + IRI res = classes.get(name); if (null == res) { throw new IllegalArgumentException("Unknown resource name '" + name + "'"); } @@ -107,10 +106,10 @@ public abstract class Vocabulary { * Returns a property defined within this vocabulary. * * @param name property name. - * @return the URI associated to such property. + * @return the IRI associated to such property. */ - public URI getProperty(String name) { - URI prop = properties.get(name); + public IRI getProperty(String name) { + IRI prop = properties.get(name); if (null == prop) { throw new IllegalArgumentException("Unknown property name '" + name + "'"); } @@ -123,10 +122,10 @@ public abstract class Vocabulary { * * @param name property name. * @param defaultValue the default value if property name not found. - * @return the URI associated to such property. + * @return the IRI associated to such property. */ - public URI getProperty(String name, URI defaultValue) { - URI prop = properties.get(name); + public IRI getProperty(String name, IRI defaultValue) { + IRI prop = properties.get(name); if (null == prop) { return defaultValue; } @@ -134,14 +133,14 @@ public abstract class Vocabulary { } /** - * Returns the property URI for the specified property string. + * Returns the property IRI for the specified property string. * If the string contains a list of words separated by blank chars, * such words are merged and camel case separated. * * @param property property name. - * @return property URI. + * @return property IRI. */ - public URI getPropertyCamelCase(String property) { + public IRI getPropertyCamelCase(String property) { String[] names = property.split("\\W"); String camelCase = names[0]; for (int i = 1; i < names.length; i++) { @@ -154,23 +153,23 @@ public abstract class Vocabulary { /** * @return the list of all defined classes. */ - public URI[] getClasses() { + public IRI[] getClasses() { if(classes == null) { - return new URI[0]; + return new IRI[0]; } - final Collection<URI> uris = classes.values(); - return uris.toArray( new URI[ uris.size() ] ); + final Collection<IRI> IRIs = classes.values(); + return IRIs.toArray( new IRI[ IRIs.size() ] ); } /** * @return the list of all defined properties. */ - public URI[] getProperties() { + public IRI[] getProperties() { if(properties == null) { - return new URI[0]; + return new IRI[0]; } - final Collection<URI> uris = properties.values(); - return uris.toArray( new URI[ uris.size() ] ); + final Collection<IRI> IRIs = properties.values(); + return IRIs.toArray( new IRI[ IRIs.size() ] ); } /** @@ -178,7 +177,7 @@ public abstract class Vocabulary { * * @return unmodifiable list of comments. */ - public Map<URI,String> getComments() { + public Map<IRI,String> getComments() { fillResourceToCommentMap(); return Collections.unmodifiableMap(resourceToCommentMap); } @@ -190,19 +189,19 @@ public abstract class Vocabulary { * @return the human readable comment associated to the * given resource. */ - public String getCommentFor(URI resource) { + public String getCommentFor(IRI resource) { fillResourceToCommentMap(); return resourceToCommentMap.get(resource); } /** - * Creates a URI. + * Creates a IRI. * - * @param uriStr the URI string - * @return the URI instance. + * @param IRIStr the IRI string + * @return the IRI instance. */ - protected URI createURI(String uriStr) { - return ValueFactoryImpl.getInstance().createURI(uriStr); + protected IRI createIRI(String IRIStr) { + return SimpleValueFactory.getInstance().createIRI(IRIStr); } /** @@ -210,12 +209,12 @@ public abstract class Vocabulary { * * @param namespace vocabulary namespace. * @param resource name of the resource. - * @return the created resource URI. + * @return the created resource IRI. */ - protected URI createClass(String namespace, String resource) { - URI res = createURI(namespace, resource); + protected IRI createClass(String namespace, String resource) { + IRI res = createIRI(namespace, resource); if(classes == null) { - classes = new HashMap<String, URI>(10); + classes = new HashMap<String, IRI>(10); } classes.put(resource, res); return res; @@ -226,37 +225,37 @@ public abstract class Vocabulary { * * @param namespace vocabulary namespace. * @param property name of the property. - * @return the created property URI. + * @return the created property IRI. */ - protected URI createProperty(String namespace, String property) { - URI res = createURI(namespace, property); + protected IRI createProperty(String namespace, String property) { + IRI res = createIRI(namespace, property); if(properties == null) { - properties = new HashMap<String, URI>(10); + properties = new HashMap<String, IRI>(10); } properties.put(property, res); return res; } /** - * Creates a URI. + * Creates a IRI. * * @param namespace * @param localName * @return */ - private URI createURI(String namespace, String localName) { - return ValueFactoryImpl.getInstance().createURI(namespace, localName); + private IRI createIRI(String namespace, String localName) { + return SimpleValueFactory.getInstance().createIRI(namespace, localName); } private void fillResourceToCommentMap() { if(resourceToCommentMap != null) return; - final Map<URI,String> newMap = new HashMap<URI, String>(); + final Map<IRI,String> newMap = new HashMap<IRI, String>(); for (Field field : this.getClass().getFields()) { try { final Object value = field.get(this); - if(value instanceof URI) { + if(value instanceof IRI) { final Comment comment = field.getAnnotation(Comment.class); - if(comment != null) newMap.put((URI) value, comment.value()); + if(comment != null) newMap.put((IRI) value, comment.value()); } } catch (IllegalAccessException iae) { throw new RuntimeException("Error while creating resource to comment map.", iae);
