Update to Jena 5.3.0

afs · Jan 23, 2025 · 1006977 · 1006977
1 parent d5ccda9
commit 1006977
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 41 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>17</java.version>
 
-    <ver.jena>5.2.0</ver.jena>
+    <ver.jena>5.3.0</ver.jena>
     <ver.jetty>12.0.16</ver.jetty>
 
     <!-- Ensure we get a version compatible with Jena. -->

diff --git a/rdf-delta-client/src/main/java/org/seaborne/delta/client/assembler/DeltaAssembler.java b/rdf-delta-client/src/main/java/org/seaborne/delta/client/assembler/DeltaAssembler.java
@@ -31,16 +31,15 @@
 import org.apache.jena.assembler.Mode;
 import org.apache.jena.assembler.assemblers.AssemblerBase;
 import org.apache.jena.assembler.exceptions.AssemblerException;
-import org.apache.jena.atlas.lib.ListUtils;
 import org.apache.jena.atlas.lib.NotImplemented;
 import org.apache.jena.atlas.logging.FmtLog;
 import org.apache.jena.atlas.logging.Log;
+import org.apache.jena.dboe.base.file.Location;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.DatasetFactory;
 import org.apache.jena.rdf.model.*;
 import org.apache.jena.sparql.core.DatasetGraph;
 import org.apache.jena.sparql.util.graph.GraphUtils;
-import org.apache.jena.dboe.base.file.Location;
 import org.seaborne.delta.Delta;
 import org.seaborne.delta.client.DeltaConnection;
 import org.seaborne.delta.client.DeltaLinkHTTP;
@@ -151,13 +150,13 @@ private List<String> getAsMultiStringValue(Resource r, Property p) {
 
         RDFList rdfList = obj.asResource().as( RDFList.class );
         List<RDFNode> x = rdfList.asJavaList();
-        List<String> xs = ListUtils.toList(x.stream().map(n->{
+        List<String> xs = x.stream().map(n->{
             if ( n.isLiteral() )
                 return n.asLiteral().getLexicalForm();
             if ( n.isURIResource() )
                 return n.asResource().getURI();
             throw new AssemblerException(r, "Not a string or URI: "+n);
-        }));
+        }).toList();
         return xs;
     }
 

diff --git a/rdf-delta-cmds/src/test/java/org/seaborne/delta/cmds/CmdTestLib.java b/rdf-delta-cmds/src/test/java/org/seaborne/delta/cmds/CmdTestLib.java
@@ -21,12 +21,12 @@
 import java.net.BindException;
 
 import delta.server.DeltaServerCmd;
-import org.apache.jena.atlas.io.NullOutputStream;
+import org.apache.commons.io.output.NullOutputStream;
 import org.apache.jena.atlas.web.WebLib;
 
 public class CmdTestLib {
 
-    static PrintStream devnull= new PrintStream(new NullOutputStream());
+    static PrintStream devnull = new PrintStream(NullOutputStream.INSTANCE);
 
     static void cmd(String...args) {
         dcmd.main(args);

diff --git a/rdf-delta-cmds/src/test/java/org/seaborne/delta/cmds/TestCmdServerZkS3.java b/rdf-delta-cmds/src/test/java/org/seaborne/delta/cmds/TestCmdServerZkS3.java
@@ -25,7 +25,7 @@
 
 import delta.server.DeltaServerCmd;
 import io.findify.s3mock.S3Mock;
-import org.apache.jena.atlas.io.NullOutputStream;
+import org.apache.commons.io.output.NullOutputStream;
 import org.apache.jena.atlas.web.HttpException;
 import org.apache.jena.atlas.web.WebLib;
 import org.apache.jena.http.HttpOp;
@@ -90,9 +90,9 @@ public void deltaZkS3_3() {
     }
 
     // Run sending System.out to /dev/null
-    // Note: this is unliely to affect logging - System.out wil have been read and stored internally.
+    // Note: this is unliely to affect logging - System.out will have been read and stored internally.
     private static void runDevNull(Runnable action) {
-        PrintStream nullOutput = new PrintStream(new NullOutputStream());
+        PrintStream nullOutput = new PrintStream(NullOutputStream.INSTANCE);
         PrintStream ps = System.out;
         System.setOut(nullOutput);
         try {

diff --git a/rdf-delta-integration-tests/src/main/java/org/seaborne/delta/load/Driver.java b/rdf-delta-integration-tests/src/main/java/org/seaborne/delta/load/Driver.java
@@ -191,7 +191,7 @@ protected static FusekiServer fuseki(int port, Model assembler) {
       if ( server != null )
           AssemblerUtils.mergeContext(server, Fuseki.getContext()) ;
       // Process services, whether via server ja:services or, if absent, by finding by type.
-      List<DataAccessPoint> x = FusekiConfig.servicesAndDatasets(assembler);
+      List<DataAccessPoint> x = FusekiConfig.servicesAndDatasets(assembler.getGraph());
       // Unbundle so that they accumulate.
       x.forEach(dap->builder.add(dap.getName(), dap.getDataService()));
       return builder.build();

diff --git a/rdf-delta-server-local/src/main/java/org/seaborne/delta/server/local/DeltaLinkLocal.java b/rdf-delta-server-local/src/main/java/org/seaborne/delta/server/local/DeltaLinkLocal.java
@@ -17,7 +17,6 @@
 
 package org.seaborne.delta.server.local;
 
-import static org.apache.jena.atlas.lib.ListUtils.toList;
 import static org.seaborne.delta.Id.str;
 
 import java.util.List;
@@ -28,11 +27,11 @@
 
 import org.apache.jena.atlas.json.JsonObject;
 import org.apache.jena.atlas.logging.FmtLog;
+import org.apache.jena.rdfpatch.RDFPatch;
 import org.seaborne.delta.*;
 import org.seaborne.delta.link.DeltaLink;
 import org.seaborne.delta.link.DeltaLinkListener;
 import org.seaborne.delta.link.DeltaNotConnectedException;
-import org.apache.jena.rdfpatch.RDFPatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -150,7 +149,7 @@ public List<Id> listDatasets() {
     @Override
     public List<DataSourceDescription> listDescriptions() {
         checkLink();
-        return toList(localServer.listDataSources().stream().map(ds -> ds.getDescription()));
+        return localServer.listDataSources().stream().map(ds -> ds.getDescription()).toList();
     }
 
     @Override

diff --git a/rdf-delta-server-local/src/main/java/org/seaborne/delta/server/local/PatchStore.java b/rdf-delta-server-local/src/main/java/org/seaborne/delta/server/local/PatchStore.java
@@ -25,7 +25,6 @@
 
 import org.apache.jena.atlas.lib.DateTimeUtils;
 import org.apache.jena.atlas.lib.InternalErrorException;
-import org.apache.jena.atlas.lib.ListUtils;
 import org.apache.jena.atlas.logging.FmtLog;
 import org.seaborne.delta.*;
 import org.seaborne.delta.server.local.patchstores.PatchLogBase;
@@ -167,7 +166,7 @@ public void shutdown() {
     /** All the patch logs currently managed by this {@code PatchStore}. */
     public List<DataSourceDescription> listDataSources() {
         checkInitialized();
-        return ListUtils.toList(dataSourceRegistry.dataSources().map(log->log.getDescription()));
+        return dataSourceRegistry.dataSources().map(log->log.getDescription()).toList();
     }
 
     /**

diff --git a/...-server-local/src/main/java/org/seaborne/delta/server/local/patchstores/PatchStorage.java b/...-server-local/src/main/java/org/seaborne/delta/server/local/patchstores/PatchStorage.java
@@ -20,10 +20,9 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.apache.jena.atlas.lib.ListUtils;
+import org.apache.jena.rdfpatch.RDFPatch;
 import org.seaborne.delta.Id;
 import org.seaborne.delta.Version;
-import org.apache.jena.rdfpatch.RDFPatch;
 
 /**
  * Interface for the bulk storage of patches.
@@ -53,7 +52,7 @@ public default void release() { }
     /** Release all the patches and any other state for this {@code PatchStorage} */
     public default void delete() {
         // Copy to isolate.
-        List<Id> x = ListUtils.toList(find());
+        List<Id> x = find().toList();
         x.forEach(this::delete);
     }
 }
diff --git a/...r-local/src/main/java/org/seaborne/delta/server/local/patchstores/filestore/FileArea.java b/...r-local/src/main/java/org/seaborne/delta/server/local/patchstores/filestore/FileArea.java
@@ -31,7 +31,6 @@
 import org.apache.jena.atlas.io.IOX;
 import org.apache.jena.atlas.json.JSON;
 import org.apache.jena.atlas.json.JsonObject;
-import org.apache.jena.atlas.lib.ListUtils;
 import org.apache.jena.atlas.lib.Pair;
 import org.apache.jena.atlas.logging.FmtLog;
 import org.apache.jena.atlas.logging.Log;
@@ -63,8 +62,8 @@ public static List<DataSourceDescription> scanForLogs(Path location) {
         //dataSourcePaths.forEach(p->LOG.info("Data source paths: "+p));
         disabledDataSources.forEach(p->LOG.info("  Data source: "+p+" : Disabled"));
 
-        List<DataSourceDescription> descriptions = ListUtils.toList
-            (dataSourcePaths.stream()
+        List<DataSourceDescription> descriptions =
+            dataSourcePaths.stream()
                 .map(p->{
                     // Extract name from disk name.
                     String dsName = p.getFileName().toString();
@@ -75,8 +74,8 @@ public static List<DataSourceDescription> scanForLogs(Path location) {
                         throw new DeltaConfigException("Names do not match: directory="+dsName+", dsd="+dsd);
                     return dsd;
                 })
-            .filter(Objects::nonNull)
-            );
+                .filter(Objects::nonNull)
+                .toList();
         return descriptions;
     }
 
@@ -86,7 +85,7 @@ public static List<DataSourceDescription> scanForLogs(Path location) {
      */
     private static Pair<List<Path>/*enabled*/, List<Path>/*disabled*/> scanDirectory(Path directory) {
         try (Stream<Path> paths = Files.list(directory)) {
-            List<Path> directoryEntries = ListUtils.toList( paths.filter(p->Files.isDirectory(p)).sorted() );
+            List<Path> directoryEntries = paths.filter(p->Files.isDirectory(p)).sorted().toList();
             List<Path> enabled = directoryEntries.stream()
                 .filter(path -> isEnabled(path))
                 .collect(Collectors.toList());

diff --git a/...r-local/src/main/java/org/seaborne/delta/server/local/patchstores/zk/PatchLogIndexZk.java b/...r-local/src/main/java/org/seaborne/delta/server/local/patchstores/zk/PatchLogIndexZk.java
@@ -28,7 +28,6 @@
 import org.apache.jena.atlas.json.JSON;
 import org.apache.jena.atlas.json.JsonObject;
 import org.apache.jena.atlas.lib.DateTimeUtils;
-import org.apache.jena.atlas.lib.ListUtils;
 import org.apache.jena.atlas.logging.FmtLog;
 import org.apache.jena.atlas.logging.Log;
 import org.apache.zookeeper.Watcher;
@@ -179,7 +178,7 @@ private void verify(CuratorFramework client, List<String> versions) {
         });
 
         // Find all the ids with no prev.
-        List<Id> firsts = ListUtils.toList(mapIdToPrev.entrySet().stream().filter(e->e.getValue()==null).map(e->e.getKey()));
+        List<Id> firsts = mapIdToPrev.entrySet().stream().filter(e->e.getValue()==null).map(e->e.getKey()).toList();
         if ( firsts.isEmpty() ) {
             FmtLog.error(LOG, "No initial patch found");
             return;

diff --git a/...rver-local/src/main/java/org/seaborne/delta/server/local/patchstores/zk/PatchStoreZk.java b/...rver-local/src/main/java/org/seaborne/delta/server/local/patchstores/zk/PatchStoreZk.java
@@ -35,7 +35,6 @@
 import org.apache.jena.atlas.json.JSON;
 import org.apache.jena.atlas.json.JsonObject;
 import org.apache.jena.atlas.json.JsonValue;
-import org.apache.jena.atlas.lib.ListUtils;
 import org.apache.jena.atlas.lib.SetUtils;
 import org.apache.jena.atlas.logging.FmtLog;
 import org.apache.jena.atlas.logging.Log;
@@ -315,7 +314,7 @@ private List<DataSourceDescription> listDataSourcesZkPath_alt(String logsPath) {
                 })
                 .filter(Objects::nonNull)
                 ;
-        return ListUtils.toList(descriptions);
+        return descriptions.toList();
     }
 
     @Override

diff --git a/...r-local/src/test/java/org/seaborne/delta/server/patchstores/AbstractTestPatchStorage.java b/...r-local/src/test/java/org/seaborne/delta/server/patchstores/AbstractTestPatchStorage.java
@@ -21,19 +21,18 @@
 
 import java.util.List;
 
-import org.apache.jena.atlas.lib.ListUtils;
+import org.apache.jena.rdfpatch.RDFPatch;
+import org.apache.jena.rdfpatch.RDFPatchOps;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.seaborne.delta.Id;
 import org.seaborne.delta.server.local.patchstores.PatchStorage;
-import org.apache.jena.rdfpatch.RDFPatch;
-import org.apache.jena.rdfpatch.RDFPatchOps;
 
 @FixMethodOrder(org.junit.runners.MethodSorters.NAME_ASCENDING)
 public abstract class AbstractTestPatchStorage {
-    
+
     protected abstract PatchStorage patchStorage();
-    
+
     @Test public void patchStorage_1_empty() {
         PatchStorage patchStorage = patchStorage();
         assertFalse(patchStorage.find().findAny().isPresent());
@@ -42,7 +41,7 @@ public abstract class AbstractTestPatchStorage {
         RDFPatch patch1 = patchStorage.fetch(id);
         assertNull(patch1);
     }
-    
+
     @Test public void patchStorage_2_singlePatch() {
         PatchStorage patchStorage = patchStorage();
         RDFPatch patch = RDFPatchOps.emptyPatch();
@@ -52,11 +51,11 @@ public abstract class AbstractTestPatchStorage {
         RDFPatch patch1 = patchStorage.fetch(id);
         assertNotNull(patch1);
         assertEquals(patch.getId(), patch1.getId());
-        
-        List<Id> x = ListUtils.toList(patchStorage.find());
+
+        List<Id> x = patchStorage.find().toList();
         assertFalse(x.isEmpty());
     }
-    
+
     @Test public void patchStorage_3_twoPatches() {
         PatchStorage patchStorage = patchStorage();
         RDFPatch patch1 = RDFPatchOps.emptyPatch();
@@ -70,16 +69,16 @@ public abstract class AbstractTestPatchStorage {
 
         RDFPatch patch2f = patchStorage.fetch(id2);
         assertNull(patch2f);
-        
+
         RDFPatch patch2 = RDFPatchOps.emptyPatch();
         patchStorage.store(id2, patch2);
-        
+
         patch2f = patchStorage.fetch(id2);
         assertNotNull(patch2f);
         assertEquals(patch2.getId(), patch2f.getId());
         assertNotEquals(patch1.getId(), patch2f.getId());
         assertNotEquals(patch1f.getId(), patch2f.getId());
-        
+
         RDFPatch patch1f_a = patchStorage.fetch(id1);
         assertNotNull(patch1f_a);
         assertEquals(patch1f_a.getId(), patch1f_a.getId());