Update jena-arq to 4.10

Reamer · Oct 28, 2024 · 773eecc · 773eecc
1 parent ea0802d
commit 773eecc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/sparql/pom.xml b/sparql/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <interpreter.name>sparql</interpreter.name>
-        <jena.version>3.12.0</jena.version>
+        <jena.version>4.10.0</jena.version>
     </properties>
 
     <dependencies>

diff --git a/sparql/src/main/java/org/apache/zeppelin/sparql/JenaInterpreter.java b/sparql/src/main/java/org/apache/zeppelin/sparql/JenaInterpreter.java
@@ -20,7 +20,6 @@
 import org.apache.http.HttpStatus;
 
 import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryParseException;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.ResultSetFormatter;
@@ -57,10 +56,10 @@ public JenaInterpreter(String serviceEndpoint, boolean replaceURIs, boolean remo
 
   @Override
   public InterpreterResult query(String query) {
-    LOGGER.info("SPARQL: Run Query '" + query + "' against " + serviceEndpoint);
+    LOGGER.info("SPARQL: Run Query '{}' against {}", query, serviceEndpoint);
 
     try {
-      queryExecution = QueryExecutionFactory.sparqlService(serviceEndpoint, query);
+      queryExecution = QueryExecution.service(serviceEndpoint).query(query).build();
       PrefixMapping prefixMapping = queryExecution.getQuery().getPrefixMapping();
 
       // execute query and get Results
@@ -92,7 +91,7 @@ public InterpreterResult query(String query) {
         "Error: " + e.getMessage());
     } catch (QueryExceptionHTTP e) {
       LOGGER.error(e.toString());
-      int responseCode = e.getResponseCode();
+      int responseCode = e.getStatusCode();
 
       if (responseCode == HttpStatus.SC_UNAUTHORIZED) {
         return new InterpreterResult(

diff --git a/sparql/src/main/java/org/apache/zeppelin/sparql/SparqlInterpreter.java b/sparql/src/main/java/org/apache/zeppelin/sparql/SparqlInterpreter.java
@@ -42,8 +42,8 @@ public class SparqlInterpreter extends Interpreter {
 
   public static final String ENGINE_TYPE_JENA = "jena";
 
-  public SparqlEngine engine;
-  
+  private SparqlEngine engine;
+
   /**
    * Sparql Engine Type.
    */
@@ -73,7 +73,7 @@ public void open() {
 
     if (SparqlEngineType.JENA.toString().equals(engineType)) {
       engine = new JenaInterpreter(serviceEndpoint, replaceURIs, removeDatatypes);
-    } 
+    }
   }
 
   @Override

diff --git a/sparql/src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java b/sparql/src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.zeppelin.sparql;
 
-import org.apache.jena.fuseki.Fuseki;
+import org.apache.jena.atlas.web.WebLib;
 import org.apache.jena.fuseki.main.FusekiServer;
 import org.apache.jena.fuseki.server.DataAccessPointRegistry;
 import org.apache.jena.query.Dataset;
@@ -52,7 +52,7 @@ class SparqlJenaEngineTest {
 
   @BeforeAll
   public static void setUp() {
-    port = Fuseki.choosePort();
+    port = WebLib.choosePort();
 
     Model model = ModelFactory.createDefaultModel();
     model.read(DATA_FILE);