GH-4012: Sync with the current state of RDF Tests CG.

jena-arq/src/main/java/org/apache/jena/riot/system/streammgr/JenaIOEnvironment.java

@@ -35,8 +35,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** Code for using the general facilities of the location mapper/ filemanager subsystem
- *  and set up for Jena usage. e.g. find a location mapper with RDf description.
+/**
+ * Code for using the general facilities of the location mapper/ filemanager subsystem
+ * and set up for Jena usage. e.g. find a location mapper with RDf description.
  */
 public class JenaIOEnvironment
 {

jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/ResultSetGraphVocab.java

@@ -21,63 +21,58 @@
 
 package org.apache.jena.sparql.vocabulary ;
 
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.rdf.model.ModelFactory ;
 import org.apache.jena.rdf.model.Property ;
 import org.apache.jena.rdf.model.Resource ;
-
+import org.apache.jena.rdf.model.ResourceFactory;
+
 /**
- * Vocabulary definitions from result-set.n3 
- * @author Auto-generated by schemagen on 10 Jun 2006 18:47 
+ * Vocabulary definitions from result-set.n3
  */
 public class ResultSetGraphVocab {
-    /** <p>The RDF model that holds the vocabulary terms</p> */
-    private static Model m_model = ModelFactory.createDefaultModel();
-
-    /** <p>The namespace of the vocabulary as a string</p> */
+    /** The namespace of the vocabulary as a string */
     public static final String NS = "http://www.w3.org/2001/sw/DataAccess/tests/result-set#";
-    
-    /** <p>The namespace of the vocabulary as a string</p>
+
+    /** The namespace of the vocabulary as a string
      *  @see #NS */
     public static String getURI() {return NS;}
-    
-    /** <p>The namespace of the vocabulary as a resource</p> */
-    public static final Resource NAMESPACE = m_model.createResource( NS );
-    
-    /** <p>Boolean result</p> */
-    public static final Property p_boolean = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#boolean" );
-    
-    /** <p>Variable name</p> */
-    public static final Property value = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#value" );
-    
-    /** <p>Variable name</p> */
-    public static final Property variable = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#variable" );
-    
-    /** <p>Index for ordered result sets</p> */
-    public static final Property index = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#index" );
-    
-    /** <p>Multi-occurrence property associating a result solution (row) resource to 
-     *  a single (variable, value) binding</p>
+
+    /** The namespace of the vocabulary as a resource */
+    public static final Resource NAMESPACE = ResourceFactory.createResource( NS );
+
+    /** Boolean result */
+    public static final Property p_boolean = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#boolean" );
+
+    /** Variable name */
+    public static final Property value = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#value" );
+
+    /** Variable name */
+    public static final Property variable = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#variable" );
+
+    /** Index for ordered result sets */
+    public static final Property index = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#index" );
+
+    /** Multi-occurrence property associating a result solution (row) resource to
+     *  a single (variable, value) binding
      */
-    public static final Property binding = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#binding" );
-    
-    /** <p>MultivaluedName of a variable used in the result set</p> */
-    public static final Property resultVariable = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#resultVariable" );
-    
-    /** <p>Number of rows in the result table</p> */
-    public static final Property size = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#size" );
-    
-    public static final Property solution = m_model.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#solution" );
-    
-    /** <p>Class of things that represent a single (variable, value) pairing</p> */
-    public static final Resource ResultBinding = m_model.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#ResultBinding" );
-    
-    /** <p>Class of things that represent a row in the result table - one solution to 
-     *  the query</p>
+    public static final Property binding = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#binding" );
+
+    /** MultivaluedName of a variable used in the result set */
+    public static final Property resultVariable = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#resultVariable" );
+
+    /** Number of rows in the result table */
+    public static final Property size = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#size" );
+
+    public static final Property solution = ResourceFactory.createProperty( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#solution" );
+
+    /** Class of things that represent a single (variable, value) pairing */
+    public static final Resource ResultBinding = ResourceFactory.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#ResultBinding" );
+
+    /** Class of things that represent a row in the result table - one solution to
+     *  the query
      */
-    public static final Resource ResultSolution = m_model.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#ResultSolution" );
-    
-    /** <p>Class of things that represent the result set</p> */
-    public static final Resource ResultSet = m_model.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#ResultSet" );
-    
+    public static final Resource ResultSolution = ResourceFactory.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#ResultSolution" );
+
+    /** Class of things that represent the result set */
+    public static final Resource ResultSet = ResourceFactory.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/result-set#ResultSet" );
+
 }

jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/SPARQL.java

@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *   SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.apache.jena.sparql.vocabulary;
+
+public class SPARQL {
+    public static final String NS = "http://www.w3.org/ns/sparql#";
+
+}

jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/SPARQLVersions.java

@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *   SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.apache.jena.sparql.vocabulary;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+
+public enum SPARQLVersions {
+/*
+
+PREFIX sparql:  <http://www.w3.org/ns/sparql#>
+
+## URIs for versions of SPARQL
+## The rdfs:label corresponds to the constant defined in SPARQL Query Language.
+
+
+sparql:version-1.2 a rdfs:Resource ;
+    rdfs:label "1.2" ;
+    rdfs:comment "Version 1.2." ;
+    rdfs:isDefinedBy <https://www.w3.org/ns/sparql> ;
+    rdfs:seeAlso <http://www.w3.org/TR/sparql12-query/> ;
+    .
+
+sparql:version-1.2-basic a rdfs:Resource ;
+    rdfs:label "1.2-basic" ;
+    rdfs:comment "Version 1.2-basic" ;
+    rdfs:isDefinedBy <https://www.w3.org/ns/sparql> ;
+    rdfs:seeAlso <http://www.w3.org/TR/sparql12-query/> ;
+    .
+
+sparql:version-1.1 a rdfs:Resource ;
+    rdfs:label "1.1" ;
+    rdfs:comment "Version 1.1" ;
+    rdfs:isDefinedBy <https://www.w3.org/ns/sparql> ;
+    dc:conformsTo <http://www.w3.org/TR/sparql11-query/> ;
+    .
+
+sparql:version-1.0 a rdfs:Resource ;
+    rdfs:label "1.0" ;
+    rdfs:comment "Version 1.0" ;
+    rdfs:isDefinedBy <https://www.w3.org/ns/sparql> ;
+    dc:conformsTo <http://www.w3.org/TR/sparql10-query/> ;
+    .
+ */
+
+    SPARQL_10(SPARQL.NS+"version-1.0", "1.0"),
+    SPARQL_11(SPARQL.NS+"version-1.1", "1.1"),
+    SPARQL_12_basic(SPARQL.NS+"version-1.2-basic", "1.2-basic"),
+    SPARQL_12(SPARQL.NS+"version-1.2", "1.2");
+
+    public final String uri;
+    public final Node term;
+    public final String label;
+
+    SPARQLVersions(String uri, String label) {
+        this.uri = uri;
+        this.term = NodeFactory.createURI(uri);
+        this.label = label;
+    }
+}