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 6e8b170c9a8ac01e3c65e129f9e2dc6f382965e8 Author: Andy Seaborne <[email protected]> AuthorDate: Wed Jan 8 10:47:29 2025 +0000 Return actual type for timeout setter operations --- .../jena/sparql/exec/QueryExecBuilderAdapter.java | 12 ++++++++---- .../jena/sparql/exec/QueryExecDatasetBuilder.java | 17 +++++++++++------ .../java/org/apache/jena/sparql/exec/QueryExecMod.java | 13 +++++-------- .../jena/sparql/exec/http/QueryExecHTTPBuilder.java | 8 +++++++- .../apache/jena/sparql/modify/UpdateProcessorBase.java | 8 ++++---- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecBuilderAdapter.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecBuilderAdapter.java index be6c951ef5..897abe353f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecBuilderAdapter.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecBuilderAdapter.java @@ -36,8 +36,7 @@ import org.apache.jena.sparql.util.ModelUtils; import org.apache.jena.sparql.util.Symbol; /** QueryExecBuilder view over a QueryExecutionBuilder */ -public class QueryExecBuilderAdapter - implements QueryExecBuilder +public class QueryExecBuilderAdapter implements QueryExecBuilder { protected QueryExecutionBuilder builder; @@ -143,11 +142,16 @@ public class QueryExecBuilderAdapter } @Override - public QueryExecBuilder timeout(long value, TimeUnit timeUnit) { - builder = builder.timeout(value, timeUnit); + public QueryExecBuilder timeout(long timeout, TimeUnit timeUnit) { + builder = builder.timeout(timeout, timeUnit); return this; } + @Override + public QueryExecBuilder timeout(long timeout) { + return timeout(timeout, TimeUnit.MILLISECONDS); + } + @Override public QueryExec build() { QueryExecution qExec = builder.build(); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java index 6ba3ead521..f028893669 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java @@ -163,20 +163,25 @@ public class QueryExecDatasetBuilder implements QueryExecMod, QueryExecBuilder { } @Override - public QueryExecDatasetBuilder timeout(long value, TimeUnit timeUnit) { - timeoutBuilder.timeout(value, timeUnit); + public QueryExecDatasetBuilder timeout(long timeout) { + return timeout(timeout, TimeUnit.MICROSECONDS); + } + + @Override + public QueryExecDatasetBuilder timeout(long timeout, TimeUnit timeUnit) { + timeoutBuilder.timeout(timeout, timeUnit); return this; } @Override - public QueryExecDatasetBuilder initialTimeout(long value, TimeUnit timeUnit) { - timeoutBuilder.initialTimeout(value, timeUnit); + public QueryExecDatasetBuilder initialTimeout(long timeout, TimeUnit timeUnit) { + timeoutBuilder.initialTimeout(timeout, timeUnit); return this; } @Override - public QueryExecDatasetBuilder overallTimeout(long value, TimeUnit timeUnit) { - timeoutBuilder.overallTimeout(value, timeUnit); + public QueryExecDatasetBuilder overallTimeout(long timeout, TimeUnit timeUnit) { + timeoutBuilder.overallTimeout(timeout, timeUnit); return this; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecMod.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecMod.java index 3dc8b36566..167d312db4 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecMod.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecMod.java @@ -29,14 +29,11 @@ import org.apache.jena.sparql.util.Context; */ public interface QueryExecMod { - public default QueryExecMod timeout(long timeout, TimeUnit timeoutUnits) { - overallTimeout(timeout, timeoutUnits); - return this; - } - - public default QueryExecMod timeout(long timeout) { - return timeout(timeout, TimeUnit.MILLISECONDS); - } + // All "return QueryExec" These need overriding and returning the implementation class. + + public QueryExecMod timeout(long timeout, TimeUnit timeoutUnits); + + public QueryExecMod timeout(long timeout); public QueryExecMod initialTimeout(long timeout, TimeUnit timeUnit); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTPBuilder.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTPBuilder.java index 17afa987fb..d861b7f5b5 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTPBuilder.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTPBuilder.java @@ -53,6 +53,12 @@ public class QueryExecHTTPBuilder extends ExecHTTPBuilder<QueryExecHTTP, QueryEx timeout, timeoutUnit); } + @Override + public QueryExecHTTPBuilder timeout(long timeout) { + timeout(timeout, TimeUnit.MILLISECONDS); + return thisBuilder(); + } + @Override public QueryExecHTTPBuilder initialTimeout(long timeout, TimeUnit timeUnit) { throw new UnsupportedOperationException(); @@ -60,7 +66,7 @@ public class QueryExecHTTPBuilder extends ExecHTTPBuilder<QueryExecHTTP, QueryEx @Override public QueryExecHTTPBuilder overallTimeout(long timeout, TimeUnit timeUnit) { - super.timeout(timeout, timeUnit); + timeout(timeout, timeUnit); return thisBuilder(); } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java index 8b738a9f12..d51b96e050 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java @@ -43,10 +43,10 @@ public class UpdateProcessorBase implements UpdateProcessor @Deprecated public UpdateProcessorBase(UpdateRequest request, - DatasetGraph datasetGraph, - Binding inputBinding, - Context context, - UpdateEngineFactory factory) { + DatasetGraph datasetGraph, + Binding inputBinding, + Context context, + UpdateEngineFactory factory) { this(request, datasetGraph, inputBinding, context, factory, null); }
