afs commented on code in PR #2461:
URL: https://github.com/apache/jena/pull/2461#discussion_r1609770268
##########
jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java:
##########
@@ -62,79 +62,85 @@ public static Property li(int i) {
return property("_" + i);
}
- public static final Resource Alt = Init.Alt();
- public static final Resource Bag = Init.Bag();
- public static final Resource Property = Init._Property();
- public static final Resource Seq = Init.Seq();
- public static final Resource Statement = Init.Statement();
- public static final Resource List = Init.List();
- public static final Resource nil = Init.nil();
+ public static final Resource Alt = resource("Alt");
+ public static final Resource Bag = resource("Bag");
+ public static final Resource Property = resource("Property");
+ public static final Resource Seq = resource("Seq");
+ public static final Resource Statement = resource("Statement");
+ public static final Resource List = resource("List");
+ public static final Resource nil = resource("nil");
+
+ // RDF 1.1 - the datatypes of language strings
+ public static final Resource langString = resource("langString");
+
+ // RDF 1.1 - rdf:HTML
+ public static final Resource HTML = resource("HTML");
+
+ // rdf:XMLLiteral
+ public static final Resource xmlLiteral = resource("XMLLiteral");
+
+ // rdf:dirLangString
+ public static final Resource dirLangString =
resource("dirLangString");
+
+ // rdf:JSON
+ public static final Resource JSON = resource("JSON");
+
+ // rdfs:comment "A class representing a compound literal."
+ public static final Resource CompoundLiteral =
resource("CompoundLiteral");
/**
* This property is used explicitly in facet restrictions.
* Also, it can be used as a literal type
* (e.g., {@code 'test'^^rdf:PlainLiteral}) in old ontologies based on
RDF-1.0
*
* @see <a
href="https://www.w3.org/TR/rdf-plain-literal";>rdf:PlainLiteral: A Datatype for
RDF Plain Literals (Second Edition)</a>
*/
- public final static Resource PlainLiteral = Init.PlainLiteral();
-
- public static final Property first = Init.first();
- public static final Property rest = Init.rest();
- public static final Property subject = Init.subject();
- public static final Property predicate = Init.predicate();
- public static final Property object = Init.object();
- public static final Property type = Init.type();
- public static final Property value = Init.value();
+ public final static Resource PlainLiteral = resource("PlainLiteral");
+
+ public static final Property first = property("first");
+ public static final Property rest = property("rest");
+ public static final Property subject = property("subject");
+ public static final Property predicate = property("predicate");
+ public static final Property object = property("object");
+ public static final Property type = property("type");
+ public static final Property value = property("value");
/**
* This property is used in facet restrictions.
* The facet {@code rdf:langRange} can be used to refer to a subset of
strings containing the language tag.
*
* @see <a
href="https://www.w3.org/TR/rdf-plain-literal/#langRange";>rdf:langRange</a>
*/
- public static final Property langRange = Init.langRange();
-
- // RDF 1.1 - the datatypes of language strings
- public static final Resource langString = Init.langString();
-
- // RDF 1.1 - rdf:HTML
- public static final Resource HTML = Init.HTML();
-
- // rdf:XMLLiteral
- public static final Resource xmlLiteral = Init.xmlLiteral();
-
- public static final RDFDatatype dtRDFHTML = Init.dtRDFHTML();
- public static final RDFDatatype dtLangString = Init.dtLangString();
- public static final RDFDatatype dtDirLangString = Init.dtDirLangString();
- public static final RDFDatatype dtXMLLiteral = Init.dtXMLLiteral();
-
- // Added to the RDF namespace December 2019
- // https://lists.w3.org/Archives/Public/semantic-web/2019Dec/0027.html
-
- // rdfs:comment "The datatype of RDF literals storing JSON content."
- public static final RDFDatatype dtRDFJSON = Init.dtRDFJSON();
- public static final Resource JSON = Init.JSON();
-
- // rdfs:comment "A class representing a compound literal."
- public static final Resource CompoundLiteral = Init.CompoundLiteral();
+ public static final Property langRange = property("langRange");
// rdfs:comment "The language component of a CompoundLiteral."
- public static final Property language = Init.language();
+ public static final Property language = property("language");
// rdfs:comment "The base direction component of a CompoundLiteral."
- public static final Property direction = Init.direction();
+ public static final Property direction = property("direction");
// The constant "ltr" (left to right)
public static final String dirLTR =
TextDirection.LTR.direction();
// The constant "rtl" (right to left)
public static final String dirRTL =
TextDirection.RTL.direction();
+ public static final RDFDatatype dtRDFHTML = RDFhtml.rdfHTML;
+ public static final RDFDatatype dtLangString =
RDFLangString.rdfLangString;
+ public static final RDFDatatype dtDirLangString =
RDFDirLangString.rdfDirLangString;
+ public static final RDFDatatype dtXMLLiteral =
XMLLiteralType.theXMLLiteralType;
+
+ // Added to the RDF namespace December 2019
+ // https://lists.w3.org/Archives/Public/semantic-web/2019Dec/0027.html
+
+ // rdfs:comment "The datatype of RDF literals storing JSON content."
+ public static final RDFDatatype dtRDFJSON = RDFjson.rdfJSON;
+
/** RDF constants are used during Jena initialization.
* <p>
* If that initialization is triggered by touching the RDF class,
* then the constants are null.
* <p>
* So for these cases, call this helper class: Init.function()
*/
+ @Deprecated
Review Comment:
👍🏻
##########
jena-core/src/main/java/org/apache/jena/vocabulary/OWL.java:
##########
@@ -20,178 +20,11 @@
///////////////////////////////////////
package org.apache.jena.vocabulary;
-// Imports
-///////////////////////////////////////
-import org.apache.jena.rdf.model.* ;
-
/**
* Vocabulary definitions from file:vocabularies/owl.owl
+ *
+ * @deprecated use {@link OWL1} or {@link OWL2}
*/
-public class OWL {
- // These will use ResourceFactory which creates Resource etc without a
specific model.
- // This is safer for complex initialization paths.
- protected static final Resource resource( String uri )
- { return ResourceFactory.createResource( NS+uri ); }
-
- protected static final Property property( String uri )
- { return ResourceFactory.createProperty( NS, uri ); }
-
- /** The namespace of the vocabulary as a string. */
- public static final String NS = "http://www.w3.org/2002/07/owl#";;
-
- /** The namespace of the vocabulary as a string */
- public static String getURI() {return NS;}
-
- /** The namespace of the vocabulary as a resource */
- public static final Resource NAMESPACE = ResourceFactory.createResource(
NS );
-
- /** A resource that denotes the OWL-full sublanguage of OWL */
- public static final Resource FULL_LANG = ResourceFactory.createResource(
getURI() );
-
- /** A resource, not officially sanctioned by WebOnt, that denotes the
OWL-DL sublanguage of OWL */
- public static final Resource DL_LANG =
ResourceFactory.createResource("http://www.w3.org/TR/owl-features/#term_OWLDL";
);
-
- /** A resource, not officially sanctioned by WebOnt, that denotes the
OWL-Lite sublanguage of OWL */
- public static final Resource LITE_LANG =
ResourceFactory.createResource("http://www.w3.org/TR/owl-features/#term_OWLLite";
);
-
- // Vocabulary properties
- ///////////////////////////
-
- public static final Property maxCardinality = Init.maxCardinality();
-
- public static final Property versionInfo = Init.versionInfo();
-
- public static final Property equivalentClass = Init.equivalentClass();
-
- public static final Property distinctMembers = Init.distinctMembers();
-
- public static final Property oneOf = Init.oneOf();
-
- public static final Property sameAs = Init.sameAs();
-
- public static final Property incompatibleWith = Init.incompatibleWith();
-
- public static final Property minCardinality = Init.minCardinality();
-
- public static final Property complementOf = Init.complementOf();
-
- public static final Property onProperty = Init.onProperty();
-
- public static final Property equivalentProperty =
Init.equivalentProperty();
-
- public static final Property inverseOf = Init.inverseOf();
-
- public static final Property backwardCompatibleWith =
Init.backwardCompatibleWith();
-
- public static final Property differentFrom = Init.differentFrom();
-
- public static final Property priorVersion = Init.priorVersion();
-
- public static final Property imports = Init.imports();
-
- public static final Property allValuesFrom = Init.allValuesFrom();
-
- public static final Property unionOf = Init.unionOf();
-
- public static final Property hasValue = Init.hasValue();
-
- public static final Property someValuesFrom = Init.someValuesFrom();
-
- public static final Property disjointWith = Init.disjointWith();
-
- public static final Property cardinality = Init.cardinality();
-
- public static final Property intersectionOf = Init.intersectionOf();
-
- // Vocabulary classes
- ///////////////////////////
-
- public static final Resource Thing = Init.Thing();
-
- public static final Resource DataRange = Init.DataRange();
-
- public static final Resource Ontology = Init.Ontology();
-
- public static final Resource DeprecatedClass = Init.DeprecatedClass();
-
- public static final Resource AllDifferent = Init.AllDifferent();
-
- public static final Resource DatatypeProperty = Init.DatatypeProperty();
-
- public static final Resource SymmetricProperty = Init.SymmetricProperty();
-
- public static final Resource TransitiveProperty =
Init.TransitiveProperty();
-
- public static final Resource DeprecatedProperty =
Init.DeprecatedProperty();
-
- public static final Resource AnnotationProperty =
Init.AnnotationProperty();
-
- public static final Resource Restriction = Init.Restriction();
-
- public static final Resource Class = Init.Class();
-
- public static final Resource OntologyProperty = Init.OntologyProperty();
-
- public static final Resource ObjectProperty = Init.ObjectProperty();
-
- public static final Resource FunctionalProperty =
Init.FunctionalProperty();
-
- public static final Resource InverseFunctionalProperty =
Init.InverseFunctionalProperty();
-
- public static final Resource Nothing = Init.Nothing();
-
- // Vocabulary individuals
- ///////////////////////////
-
- /** OWL constants are used during Jena initialization.
- * <p>
- * If that initialization is triggered by touching the OWL class,
- * then the constants are null.
- * <p>
- * So for these cases, call this helper class: Init.function()
- */
- public static class Init {
- // JENA-1294
- // Version that calculate the constant when called.
- public static Property maxCardinality() { return property(
"maxCardinality" ); }
- public static Property versionInfo() { return property(
"versionInfo" ); }
- public static Property equivalentClass() { return property(
"equivalentClass" ); }
- public static Property distinctMembers() { return property(
"distinctMembers" ); }
- public static Property oneOf() { return property(
"oneOf" ); }
- public static Property sameAs() { return property(
"sameAs" ); }
- public static Property incompatibleWith() { return property(
"incompatibleWith" ); }
- public static Property minCardinality() { return property(
"minCardinality" ); }
- public static Property complementOf() { return property(
"complementOf" ); }
- public static Property onProperty() { return property(
"onProperty" ); }
- public static Property equivalentProperty() { return property(
"equivalentProperty" ); }
- public static Property inverseOf() { return property(
"inverseOf" ); }
- public static Property backwardCompatibleWith() { return property(
"backwardCompatibleWith" ); }
- public static Property differentFrom() { return property(
"differentFrom" ); }
- public static Property priorVersion() { return property(
"priorVersion" ); }
- public static Property imports() { return property(
"imports" ); }
- public static Property allValuesFrom() { return property(
"allValuesFrom" ); }
- public static Property unionOf() { return property(
"unionOf" ); }
- public static Property hasValue() { return property(
"hasValue" ); }
- public static Property someValuesFrom() { return property(
"someValuesFrom" ); }
- public static Property disjointWith() { return property(
"disjointWith" ); }
- public static Property cardinality() { return property(
"cardinality" ); }
- public static Property intersectionOf() { return property(
"intersectionOf" ); }
- public static Resource Thing() { return resource(
"Thing" ); }
- public static Resource DataRange() { return resource(
"DataRange" ); }
- public static Resource Ontology() { return resource(
"Ontology" ); }
- public static Resource DeprecatedClass() { return resource(
"DeprecatedClass" ); }
- public static Resource AllDifferent() { return resource(
"AllDifferent" ); }
- public static Resource DatatypeProperty() { return resource(
"DatatypeProperty" ); }
- public static Resource SymmetricProperty() { return resource(
"SymmetricProperty" ); }
- public static Resource TransitiveProperty() { return resource(
"TransitiveProperty" ); }
- public static Resource DeprecatedProperty() { return resource(
"DeprecatedProperty" ); }
- public static Resource AnnotationProperty() { return resource(
"AnnotationProperty" ); }
- public static Resource Restriction() { return resource(
"Restriction" ); }
- public static Resource Class() { return resource(
"Class" ); }
- public static Resource OntologyProperty() { return resource(
"OntologyProperty" ); }
- public static Resource ObjectProperty() { return resource(
"ObjectProperty" ); }
- public static Resource FunctionalProperty() { return resource(
"FunctionalProperty" ); }
- public static Resource InverseFunctionalProperty() { return resource(
"InverseFunctionalProperty" ); }
- public static Resource Nothing() { return resource(
"Nothing" ); }
- }
+@Deprecated
+public class OWL extends OWL1 {
Review Comment:
This cases 424 warnings on the Jena code base!
200 are in jena-core:src/main/java:org.apache.jena.ontology
50 are in jena-core:src/main/java:org.apache.jena.reasoner
155 are in jena-core tests
Shouldn't these all be OWL1?
As vocabularies, is there anything OWL2 that conflicts with OWL1?
Would it work if we change all uses in Jena to be OWL1 where it must be OWL1
(legacy ontology, reasoner) then have `public class OWL extends OWL2`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: pr-unsubscr...@jena.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscr...@jena.apache.org
For additional commands, e-mail: pr-h...@jena.apache.org
