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 <[email protected]> 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;
