You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2026/02/26 09:20:06 UTC
(jena) branch main updated (6a09f4f519 -> dbade7d4f9)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from 6a09f4f519 Bump the npm-patch-group group
new da879b5ec7 Print VERSION in PrintingStreamRDF
new c4e11858ca create method for StreamRDF2
new 46dc8347c7 Check for missing test manifest entries
new dbade7d4f9 Cody tidy
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/jena/http/HttpLib.java | 5 +-
.../apache/jena/riot/system/PrintingStreamRDF.java | 10 +++-
.../org/apache/jena/riot/system/StreamRDF2.java | 11 +++-
.../java/org/apache/jena/sparql/exec/http/GSP.java | 1 -
.../jena/sparql/exec/http/StoreProtocol.java | 65 +---------------------
.../apache/jena/arq/junit/manifest/Manifest.java | 17 +++++-
.../jena/arq/junit/textrunner/ManifestHolder.java | 4 ++
7 files changed, 42 insertions(+), 71 deletions(-)
(jena) 04/04: Cody tidy
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit dbade7d4f9fdccbc999280b6a96219156acfd855
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed Feb 25 19:11:26 2026 +0000
Cody tidy
---
.../main/java/org/apache/jena/http/HttpLib.java | 5 +-
.../java/org/apache/jena/sparql/exec/http/GSP.java | 1 -
.../jena/sparql/exec/http/StoreProtocol.java | 65 +---------------------
3 files changed, 5 insertions(+), 66 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/http/HttpLib.java b/jena-arq/src/main/java/org/apache/jena/http/HttpLib.java
index 94bdf71b4a..7b585f9d6e 100644
--- a/jena-arq/src/main/java/org/apache/jena/http/HttpLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/http/HttpLib.java
@@ -608,7 +608,8 @@ public class HttpLib {
* @param httpRequest
* @param bodyHandler
* @return HttpResponse
- */ /*package*/ static <X> CompletableFuture<HttpResponse<X>> executeAsync(HttpClient httpClient, HttpRequest httpRequest, BodyHandler<X> bodyHandler) {
+ */
+ /*package*/ static <X> CompletableFuture<HttpResponse<X>> executeAsync(HttpClient httpClient, HttpRequest httpRequest, BodyHandler<X> bodyHandler) {
// To run with no jena-supplied authentication handling.
if ( false )
return executeJDKAsync(httpClient, httpRequest, bodyHandler);
@@ -737,7 +738,7 @@ public class HttpLib {
* <li>ARQ.httpRegistryRequestModifer - the registry, keyed by service URL.</li>
* </ul>
*/
- /*package*/ public static void modifyByService(String serviceURI, Context context, Params params, Map<String, String> httpHeaders) {
+ public static void modifyByService(String serviceURI, Context context, Params params, Map<String, String> httpHeaders) {
HttpRequestModifier modifier = context.get(ARQ.httpRequestModifer);
if ( modifier != null ) {
modifier.modify(params, httpHeaders);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/GSP.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/GSP.java
index 6ffddb9113..0d3d9ad117 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/GSP.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/GSP.java
@@ -293,7 +293,6 @@ public class GSP extends StoreProtocol<GSP> {
* @param graphName
* @return String without the "?"
*/
-
protected static String queryStringForGraph(String graphName) {
if ( graphName == null )
return HttpNames.paramGraphDefault;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/StoreProtocol.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/StoreProtocol.java
index b0b2183bcd..94276d01f5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/StoreProtocol.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/StoreProtocol.java
@@ -191,72 +191,11 @@ public abstract class StoreProtocol<X extends StoreProtocol<X>> {
final protected void httpHeaders(BiConsumer<String, String> action) { httpHeaders.forEach(action); }
protected void ensureAcceptHeader(String dftAcceptheader) {
- String requestAccept = header(acceptHeader(), WebContent.defaultRDFAcceptHeader);
+ String dft = (dftAcceptheader != null) ? dftAcceptheader : WebContent.defaultRDFAcceptHeader;
+ String requestAccept = header(acceptHeader(), dft);
acceptHeader(requestAccept);
}
-// /**
-// * POST the contents of a file using the filename extension to determine the
-// * Content-Type to use if not already set.
-// * <p>
-// * This operation does not parse the file.
-// */
-// public void POST(String file) {
-// String fileExtContentType = contentTypeFromFilename(file);
-// HttpClient hc = requestHttpClient(serviceEndpoint, serviceEndpoint);
-// uploadQuads(hc, serviceEndpoint, file, fileExtContentType, httpHeaders, Push.POST);
-// }
-//
-// /** POST a dataset */
-// public void POST(DatasetGraph dataset) {
-// RDFFormat requestFmt = rdfFormat(HttpEnv.defaultQuadsFormat);
-// HttpClient hc = requestHttpClient(serviceEndpoint, serviceEndpoint);
-// HttpRDF.httpPostDataset(hc, serviceEndpoint, dataset, requestFmt, httpHeaders);
-// }
-//
-// /**
-// * PUT the contents of a file using the filename extension to determine the
-// * Content-Type to use if not already set.
-// * <p>
-// * This operation does not parse the file.
-// */
-// public void PUT(String file) {
-// String fileExtContentType = contentTypeFromFilename(file);
-// HttpClient hc = requestHttpClient(serviceEndpoint, serviceEndpoint);
-// uploadQuads(hc, serviceEndpoint, file, fileExtContentType, httpHeaders, Push.PUT);
-// }
-//
-// /** PUT a dataset */
-// public void PUT(DatasetGraph dataset) {
-// RDFFormat requestFmt = rdfFormat(HttpEnv.defaultQuadsFormat);
-// HttpClient hc = requestHttpClient(serviceEndpoint, serviceEndpoint);
-// HttpRDF.httpPutDataset(hc, serviceEndpoint, dataset, requestFmt, httpHeaders);
-// }
-//
-//// /** Send a file of triples to a URL. */
-//// private static void uploadTriples(HttpClient httpClient, String gspUrl, String file, String fileExtContentType,
-//// Map<String, String> headers, Push mode) {
-//// Lang lang = RDFLanguages.contentTypeToLang(fileExtContentType);
-//// if ( lang == null )
-//// throw new ARQException("Not a recognized as an RDF format: "+fileExtContentType);
-//// if ( RDFLanguages.isQuads(lang) && ! RDFLanguages.isTriples(lang) )
-//// throw new ARQException("Can't load quads into a graph");
-//// if ( ! RDFLanguages.isTriples(lang) )
-//// throw new ARQException("Not an RDF format: "+file+" (lang="+lang+")");
-//// pushFile(httpClient, gspUrl, file, fileExtContentType, headers, mode);
-//// }
-//
-// /**
-// * Send a file of quads to a URL. The Content-Type is inferred from the file
-// * extension.
-// */
-// private static void uploadQuads(HttpClient httpClient, String endpoint, String file, String fileExtContentType, Map<String, String> headers, Push mode) {
-// Lang lang = RDFLanguages.contentTypeToLang(fileExtContentType);
-// if ( !RDFLanguages.isQuads(lang) && !RDFLanguages.isTriples(lang) )
-// throw new ARQException("Not an RDF format: " + file + " (lang=" + lang + ")");
-// pushFile(httpClient, endpoint, file, fileExtContentType, headers, mode);
-// }
-
/** Header string or default value. */
private static String header(String choice, String dftString) {
return choice != null ? choice : dftString;
(jena) 02/04: create method for StreamRDF2
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit c4e11858ca4d9aba3ba7349e0523fbeb9944cf3d
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed Feb 25 16:56:17 2026 +0000
create method for StreamRDF2
---
.../src/main/java/org/apache/jena/riot/system/StreamRDF2.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
index a0f4c7f45e..f5313743fa 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
@@ -29,7 +29,15 @@ public class StreamRDF2 implements StreamRDF {
protected final StreamRDF sink1;
protected final StreamRDF sink2;
- public StreamRDF2(StreamRDF sink1, StreamRDF sink2) {
+ public static StreamRDF create(StreamRDF sink1, StreamRDF sink2) {
+ if ( sink1 == null )
+ return sink2;
+ if ( sink2 == null )
+ return sink1;
+ return new StreamRDF2(sink1, sink2);
+ }
+
+ private StreamRDF2(StreamRDF sink1, StreamRDF sink2) {
this.sink1 = sink1;
this.sink2 = sink2;
}
@@ -75,5 +83,4 @@ public class StreamRDF2 implements StreamRDF {
sink1.finish();
sink2.finish();
}
-
}
(jena) 03/04: Check for missing test manifest entries
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 46dc8347c76c8ab9e63f40700ec0ed4ccc4562f6
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed Feb 25 16:57:07 2026 +0000
Check for missing test manifest entries
---
.../org/apache/jena/arq/junit/manifest/Manifest.java | 17 +++++++++++++++--
.../jena/arq/junit/textrunner/ManifestHolder.java | 4 ++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java
index bbb422ebd1..92e31fb0f8 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java
@@ -65,8 +65,7 @@ public class Manifest
} catch (RuntimeException ex) {
// Exit on error.
log.error("Error reading manifest: "+filenameOrURI);
- System.exit(1);
- throw ex;
+ throw new TestSetupException("Error reading manifest: "+filenameOrURI);
}
Manifest manifest = new Manifest(manifestRDF);
return manifest;
@@ -112,6 +111,20 @@ public class Manifest
if ( entriesNode == null )
return;
List<Node> items = G.rdfList(manifestGraph, entriesNode);
+
+ List<Node> missingEntries = items.stream().filter(entry -> ! G.contains(manifestGraph, entry, null, null)).toList();
+ if ( ! missingEntries.isEmpty() ) {
+ missingEntries.forEach(entry->{
+ String x = null;
+ if ( entry.isURI() )
+ x = manifestGraph.getPrefixMapping().shortForm(entry.getURI());
+ if ( x == null )
+ x = entry.toString();
+ log.error("Can't find entry for "+x);
+ });
+ throw new TestSetupException("Missing manifest entries");
+ }
+
items.forEach(entry->{
String testName = getLiteral(entry, TestManifest.name.asNode());
Node testType = G.getZeroOrOneSP(manifestGraph, entry, RDF.Nodes.type);
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/ManifestHolder.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/ManifestHolder.java
index 195017c698..b6da50d6f2 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/ManifestHolder.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/ManifestHolder.java
@@ -31,6 +31,7 @@ import org.apache.jena.arq.junit.Scripts;
import org.apache.jena.arq.junit.manifest.ManifestProcessor;
import org.apache.jena.arq.junit.manifest.TestMaker;
import org.apache.jena.arq.junit.manifest.TestMakers;
+import org.apache.jena.arq.junit.manifest.TestSetupException;
import org.apache.jena.atlas.lib.StreamOps;
import org.apache.jena.riot.RiotNotFoundException;
import org.apache.jena.shared.JenaException;
@@ -69,6 +70,9 @@ class ManifestHolder {
System.err.println("Not found: "+fn);
// Exceptions are swallowed by JUnit5.
throw new RiotNotFoundException("Manifest "+fn);
+ } catch (TestSetupException ex) {
+ System.exit(1);
+ return null;
} catch (Exception ex) {
ex.printStackTrace();
return null;
(jena) 01/04: Print VERSION in PrintingStreamRDF
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit da879b5ec72cef2b63051196b02f1d25e13e2d03
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed Feb 25 16:55:45 2026 +0000
Print VERSION in PrintingStreamRDF
---
.../java/org/apache/jena/riot/system/PrintingStreamRDF.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
index bba838d442..6b258baafa 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
@@ -81,12 +81,20 @@ public class PrintingStreamRDF extends WriterStreamRDFPlain
out.print("BASE") ;
out.print(" ") ;
printDirectURI(out, base);
- out.println();
flush();
// Reset the formatter because of the new base URI.
pretty = new NodeFormatterTTL(base, prefixMap);
}
+ @Override
+ public void version(String version) {
+ out.print("VERSION") ;
+ out.print(" ") ;
+ out.print(version);
+ out.println();
+ }
+
+
@Override
public void prefix(String prefix, String iri) {
out.print("PREFIX") ;