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 4a561c8b3428ff1dd9cf541d03f7fb55bb86d6e5 Author: Andy Seaborne <[email protected]> AuthorDate: Thu Nov 20 11:31:19 2025 +0000 Code tidy --- .../engine/iterator/QueryIterPlainWrapper.java | 2 +- .../sparql/engine/iterator/QueryIterProcedure.java | 92 ++++++++++------------ .../sparql/sse/builders/SSE_BuildException.java | 11 +-- .../java/org/apache/jena/sparql/util/Context.java | 42 +++++----- .../apache/jena/fuseki/servlets/ActionExecLib.java | 1 - .../apache/jena/fuseki/servlets/HttpAction.java | 2 +- .../jena/fuseki/servlets/SPARQLQueryProcessor.java | 3 +- 7 files changed, 70 insertions(+), 83 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java index dac45c196c..ac7d6fe3ce 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java @@ -73,7 +73,7 @@ public class QueryIterPlainWrapper extends QueryIter @Override protected void requestCancel() - { } + { closeIterator(); } @Override public void output(IndentedWriter out, SerializationContext sCxt) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java index eaf6da1860..d528545712 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java @@ -18,73 +18,65 @@ package org.apache.jena.sparql.engine.iterator; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.atlas.lib.Lib ; -import org.apache.jena.sparql.engine.ExecutionContext ; -import org.apache.jena.sparql.engine.QueryIterator ; -import org.apache.jena.sparql.engine.binding.Binding ; -import org.apache.jena.sparql.procedure.Procedure ; -import org.apache.jena.sparql.serializer.SerializationContext ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.atlas.lib.Lib; +import org.apache.jena.sparql.engine.ExecutionContext; +import org.apache.jena.sparql.engine.QueryIterator; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.procedure.Procedure; +import org.apache.jena.sparql.serializer.SerializationContext; -/** QueryIterator for a procedure. Delays first touch until first call because - * first touch may cause work to be done. - * - * Assumes .build already called. */ +/** + * QueryIterator for a procedure. Delays first touch until first call because first + * touch may cause work to be done. + */ + +public class QueryIterProcedure extends QueryIter1 { + private final Procedure proc; + private boolean initialized = false; + private QueryIterator procIter = null; -public class QueryIterProcedure extends QueryIter1 -{ - private Procedure proc ; - private boolean initialized = false ; - private QueryIterator procIter = null ; - - public QueryIterProcedure(QueryIterator input, Procedure proc, ExecutionContext execCxt) - { - super(input, execCxt) ; - this.proc = proc ; + public QueryIterProcedure(QueryIterator input, Procedure proc, ExecutionContext execCxt) { + super(input, execCxt); + this.proc = proc; } - private void init() - { - if ( ! initialized ) - { - procIter = proc.proc(getInput(), getExecContext()) ; - initialized = true ; + private void init() { + if ( !initialized ) { + procIter = proc.proc(getInput(), getExecContext()); + initialized = true; } } @Override - protected void closeSubIterator() - { - init() ; // Ensure initialized even if immediately closed. - procIter.close(); + protected void closeSubIterator() { + // Ensure initialized even if immediately closed. + init(); + procIter.close(); } @Override - protected void requestSubCancel() - { - if (procIter != null) - procIter.cancel(); + protected void requestSubCancel() { + if ( procIter != null ) + procIter.cancel(); } - + @Override - protected boolean hasNextBinding() - { - init() ; - return procIter.hasNext() ; + protected boolean hasNextBinding() { + init(); + return procIter.hasNext(); } @Override - protected Binding moveToNextBinding() - { - init( ) ; - return procIter.nextBinding() ; + protected Binding moveToNextBinding() { + init(); + return procIter.nextBinding(); } - + @Override - protected void details(IndentedWriter out, SerializationContext sCxt) - { - out.print(Lib.className(this)) ; - out.print(" ") ; - proc.output(out, sCxt) ; + protected void details(IndentedWriter out, SerializationContext sCxt) { + out.print(Lib.className(this)); + out.print(" "); + proc.output(out, sCxt); } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java index 2b779c31b4..bca13ff4f9 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java @@ -20,10 +20,7 @@ package org.apache.jena.sparql.sse.builders; import org.apache.jena.sparql.sse.ItemException; -public class SSE_BuildException extends ItemException -{ -// public BuildException(Throwable cause) { super(cause); } -// public BuildException() { super(); } - public SSE_BuildException (String msg) { super(msg); } - public SSE_BuildException (String msg, Throwable cause) { super(msg, cause); } - } +public class SSE_BuildException extends ItemException { + public SSE_BuildException (String msg) { super(msg); } + public SSE_BuildException (String msg, Throwable cause) { super(msg, cause); } +} diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java index 370d93bf49..308398df29 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java @@ -390,6 +390,27 @@ public class Context { context.clear(); } + /** Atomic compute. */ + @SuppressWarnings("unchecked") + public <V> V compute(Symbol key, BiFunction<Symbol, Object, ? extends V> remappingFunction) { + Object obj = context.compute(key, remappingFunction); + return (V)obj; + } + + /** Atomic computeIfAbsent. */ + @SuppressWarnings("unchecked") + public <V> V computeIfAbsent(Symbol key, Function<Symbol, ? extends V> mappingFunction) { + Object obj = context.computeIfAbsent(key, mappingFunction); + return (V)obj; + } + + /** Atomic computeIfPresent. */ + @SuppressWarnings("unchecked") + public <V> V computeIfPresent(Symbol key, BiFunction<Symbol, Object, V> remappingFunction) { + Object obj = context.computeIfPresent(key, remappingFunction); + return (V)obj; + } + @Override public String toString() { String x = ""; @@ -434,27 +455,6 @@ public class Context { } } - /** Atomic compute. */ - @SuppressWarnings("unchecked") - public <V> V compute(Symbol key, BiFunction<Symbol, Object, ? extends V> remappingFunction) { - Object obj = context.compute(key, remappingFunction); - return (V)obj; - } - - /** Atomic computeIfAbsent. */ - @SuppressWarnings("unchecked") - public <V> V computeIfAbsent(Symbol key, Function<Symbol, ? extends V> mappingFunction) { - Object obj = context.computeIfAbsent(key, mappingFunction); - return (V)obj; - } - - /** Atomic computeIfPresent. */ - @SuppressWarnings("unchecked") - public <V> V computeIfPresent(Symbol key, BiFunction<Symbol, Object, V> remappingFunction) { - Object obj = context.computeIfPresent(key, remappingFunction); - return (V)obj; - } - /** Get the context's cancel signal. Create and set one if needed. Context must not be null. */ public static AtomicBoolean getOrSetCancelSignal(Context context) { try { diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java index f83a342083..96ec9dca2e 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java @@ -385,5 +385,4 @@ public class ActionExecLib { Fuseki.serverLog.warn("Exception on counter dec", ex); } } - } diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java index e9c015aff3..04f54634f9 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java @@ -190,7 +190,7 @@ public class HttpAction transactional = dsg; isTransactional = false; } else { - // Nothing to build on. Be safe. + // Nothing to build on. Be safe. transactional = TransactionalLock.createMutex(); isTransactional = false; } diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java index 84f4d9fd1b..186d7e3e6e 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java @@ -303,8 +303,7 @@ public abstract class SPARQLQueryProcessor extends ActionService action.abortSilent(); } - /** - * Check the query - if unacceptable, throw ActionErrorException + /** Check the query - if unacceptable, throw ActionErrorException * or call on of the {@link ServletOps#error} operations. * @param action HTTP Action * @param query SPARQL Query
