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 d34d257e047fb84995df862418bf4375ea027055 Author: Andy Seaborne <[email protected]> AuthorDate: Wed Feb 4 18:15:31 2026 +0000 Cody tidy --- .../org/apache/jena/sparql/expr/ExprFunctionN.java | 4 +- .../apache/jena/sparql/expr/ExprFunctionOp.java | 6 +-- .../org/apache/jena/sparql/expr/ExprSystem.java | 43 ++++++++++------------ .../apache/jena/sparql/function/FunctionEnv.java | 17 +++++---- .../jena/sparql/function/FunctionEnvBase.java | 30 ++++----------- .../jena/sparql/graph/PrefixMappingSink.java | 1 + .../system/buffering/BufferingPrefixMapping.java | 4 +- .../org/apache/jena/atlas/iterator/TestIter.java | 1 - jena-cmds/src/test/java/arq/rdftests.java | 25 ++----------- .../jena/datatypes/xsd/impl/XMLLiteralType.java | 2 +- 10 files changed, 50 insertions(+), 83 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java index 3c1d4ecee2..9988ee989b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java @@ -67,8 +67,7 @@ public abstract class ExprFunctionN extends ExprFunction @Override public Expr copySubstitute(Binding binding) { ExprList newArgs = new ExprList(); - for ( int i = 1; i <= numArgs(); i++ ) - { + for ( int i = 1 ; i <= numArgs() ; i++ ) { Expr e = getArg(i); e = e.copySubstitute(binding); newArgs.add(e); @@ -113,5 +112,4 @@ public abstract class ExprFunctionN extends ExprFunction @Override public void visit(ExprVisitor visitor) { visitor.visit(this); } public Expr apply(ExprTransform transform, ExprList exprList) { return transform.transform(this, exprList); } - } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionOp.java index 965b9bb57c..1deb89d67c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionOp.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionOp.java @@ -88,9 +88,9 @@ public abstract class ExprFunctionOp extends ExprFunction Element elt2 = null; if (elt != null) { Map<Var, Node> map = BindingLib.bindingToMap(binding); - NodeTransform nodeTransform = new NodeTransformSubst(map); + NodeTransform nodeTransform = new NodeTransformSubst(map); ElementTransform eltTransform = new ElementTransformSubst(nodeTransform); - ExprTransform exprTransform = new ExprTransformNodeElement(nodeTransform, eltTransform); + ExprTransform exprTransform = new ExprTransformNodeElement(nodeTransform, eltTransform); elt2 = ElementTransformer.transform(elt, eltTransform, exprTransform); } return copy(elt2, op2) ; @@ -103,7 +103,7 @@ public abstract class ExprFunctionOp extends ExprFunction Element elt2 = null; if (elt != null) { ElementTransform eltTransform = new ElementTransformSubst(nodeTransform); - ExprTransform exprTransform = new ExprTransformNodeElement(nodeTransform, eltTransform); + ExprTransform exprTransform = new ExprTransformNodeElement(nodeTransform, eltTransform); elt2 = ElementTransformer.transform(elt, eltTransform, exprTransform); } return copy(elt2, op2) ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java index 7f7752f462..1e258c34c7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java @@ -21,35 +21,32 @@ package org.apache.jena.sparql.expr; -import org.apache.jena.atlas.lib.Lib ; -import org.apache.jena.graph.Node ; -import org.apache.jena.sparql.function.FunctionEnv ; -import org.apache.jena.sparql.util.Symbol ; +import org.apache.jena.atlas.lib.Lib; +import org.apache.jena.graph.Node; +import org.apache.jena.sparql.function.FunctionEnv; +import org.apache.jena.sparql.util.Symbol; -public abstract class ExprSystem extends ExprFunction0 -{ - protected final Symbol systemSymbol ; +public abstract class ExprSystem extends ExprFunction0 { + protected final Symbol systemSymbol; - protected ExprSystem(String fName, Symbol systemSymbol) - { - super(fName) ; - this.systemSymbol = systemSymbol ; + protected ExprSystem(String fName, Symbol systemSymbol) { + super(fName); + this.systemSymbol = systemSymbol; } @Override - public NodeValue eval(FunctionEnv env) - { - Object obj = env.getContext().get(systemSymbol) ; - + public NodeValue eval(FunctionEnv env) { + Object obj = env.getContext().get(systemSymbol); + if ( obj == null ) - throw new ExprEvalException("null for system symbol: "+systemSymbol) ; - if ( ! ( obj instanceof Node ) ) - throw new ExprEvalException("ExprSystem: Not a Node: "+Lib.className(obj)) ; - - Node n = (Node)obj ; + throw new ExprEvalException("null for system symbol: " + systemSymbol); + if ( !(obj instanceof Node) ) + throw new ExprEvalException("ExprSystem: Not a Node: " + Lib.className(obj)); + + Node n = (Node)obj; if ( n == null ) - throw new ExprEvalException("No value for system variable: "+systemSymbol) ; - NodeValue nv = NodeValue.makeNode(n) ; - return nv ; + throw new ExprEvalException("No value for system variable: " + systemSymbol); + NodeValue nv = NodeValue.makeNode(n); + return nv; } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnv.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnv.java index 3da792fa25..3420b62037 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnv.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnv.java @@ -29,16 +29,17 @@ import org.apache.jena.sparql.util.Context; public interface FunctionEnv { - /** Return the active graph (the one matching is against at this point in the query. - * May be null if unknown or not applicable - for example, doing quad store access or - * when sorting. - */ + /** Return the active graph (the one involved in pattern matching atthis point in the query). + * May be null if unknown or not applicable - for example, doing quad store access or when sorting. + */ public Graph getActiveGraph(); - - /** Return the dataset for the query - */ + + /** + * Return the dataset for the query. + * May be null for "unknown"/"not relevant" + */ public DatasetGraph getDataset(); - + /** Return the context for this function call */ public Context getContext(); } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java index cc04fbec13..641f264fb8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java @@ -30,50 +30,36 @@ import org.apache.jena.sparql.util.Context; /** Environment passed to functions -- see also {@link org.apache.jena.sparql.engine.ExecutionContext} */ public class FunctionEnvBase implements FunctionEnv { - private Context context; - private Graph activeGraph; - private DatasetGraph dataset; - private ExecutionContext execContext = null; + private final Context context; + private final Graph activeGraph; + private final DatasetGraph dataset; public FunctionEnvBase() { this(ARQ.getContext(), null, null); } public FunctionEnvBase(Context context) { this ( context, null, null); } - public FunctionEnvBase(ExecutionContext execCxt) - { + public FunctionEnvBase(ExecutionContext execCxt) { this(execCxt.getContext(), execCxt.getActiveGraph(), execCxt.getDataset()); - execContext = execCxt; } - public FunctionEnvBase(Context context, Graph activeGraph, DatasetGraph dataset) - { + public FunctionEnvBase(Context context, Graph activeGraph, DatasetGraph dataset) { this.context = context; this.activeGraph = activeGraph; this.dataset = dataset; } @Override - public Graph getActiveGraph() - { + public Graph getActiveGraph() { return activeGraph; } @Override - public Context getContext() - { + public Context getContext() { return context; } -// public ExecutionContext getExecutionContext() -// { -// if ( execContext == null ) -// execContext = new ExecutionContext(context, activeGraph, dataset, QC.getFactory(context)); -// return execContext; -// } - @Override - public DatasetGraph getDataset() - { + public DatasetGraph getDataset() { return dataset; } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java index d5cc9a8e79..11ac93eb92 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/PrefixMappingSink.java @@ -67,6 +67,7 @@ public class PrefixMappingSink extends PrefixMappingBase { @Override protected Map<String, String> asMap() { + // Immutable. return Collections.emptyMap(); } diff --git a/jena-arq/src/main/java/org/apache/jena/system/buffering/BufferingPrefixMapping.java b/jena-arq/src/main/java/org/apache/jena/system/buffering/BufferingPrefixMapping.java index 8c968afdfd..dcb81a32d9 100644 --- a/jena-arq/src/main/java/org/apache/jena/system/buffering/BufferingPrefixMapping.java +++ b/jena-arq/src/main/java/org/apache/jena/system/buffering/BufferingPrefixMapping.java @@ -21,6 +21,7 @@ package org.apache.jena.system.buffering; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -140,7 +141,8 @@ public class BufferingPrefixMapping extends PrefixMappingBase implements Bufferi @Override protected Map<String, String> asMapCopy() { - Map<String, String> map = other.getNsPrefixMap(); + // Mutable copy. + Map<String, String> map = new HashMap<>(other.getNsPrefixMap()); deleted.forEach(prefix->map.remove(prefix)); map.putAll(added.getNsPrefixMap()); return map; diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java index 7d0d2a1538..bbe8547422 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java @@ -21,7 +21,6 @@ package org.apache.jena.atlas.iterator; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals ; import static org.junit.jupiter.api.Assertions.assertFalse ; import static org.junit.jupiter.api.Assertions.assertTrue ; diff --git a/jena-cmds/src/test/java/arq/rdftests.java b/jena-cmds/src/test/java/arq/rdftests.java index 871e22728a..d316bb6c7b 100644 --- a/jena-cmds/src/test/java/arq/rdftests.java +++ b/jena-cmds/src/test/java/arq/rdftests.java @@ -22,18 +22,13 @@ package arq; import java.io.PrintStream; -import java.util.ArrayList; import java.util.List; -import java.util.function.Function; import arq.cmdline.ModContext; import arq.cmdline.ModEngine; import org.apache.jena.Jena; import org.apache.jena.arq.junit.EarlReport; -import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.arq.junit.riot.ParsingStepForTest; -import org.apache.jena.arq.junit.riot.RiotTests; -import org.apache.jena.arq.junit.riot.SemanticsTests; import org.apache.jena.arq.junit.riot.VocabLangRDF; import org.apache.jena.arq.junit.sparql.SparqlTests; import org.apache.jena.arq.junit.sparql.tests.QueryEvalTest; @@ -120,7 +115,7 @@ public class rdftests extends CmdMain { addModule(modContext); getUsage().startCategory("Tests (execute test manifest)"); - add(useARQ, "--arq", "Operate with ARQ syntax"); + //add(useARQ, "--arq", "Operate with ARQ syntax"); add(useTTLjcc, "--ttljcc", "Use the alternative Turtle parser in tests"); add(strictDecl, "--strict", "Operate in strict mode (no extensions of any kind)"); add(earlDecl, "--earl", "Create EARL report"); @@ -167,7 +162,7 @@ public class rdftests extends CmdMain { List<String> manifests = getPositional(); System.out.println("# Run: "+manifests); - exec(report, manifests); + exec(createEarlReport, report, manifests); if ( createEarlReport ) { earlOut.println(); @@ -189,7 +184,8 @@ public class rdftests extends CmdMain { } } - protected void exec(EarlReport earlReport, List<String> manifests) { + public static void exec(boolean createEarlReport, EarlReport earlReport, List<String> manifests) { + // See TestMakers for which test makers are installed. if ( manifests.isEmpty() ) throw new CmdException("No manifest files"); if ( createEarlReport ) @@ -198,19 +194,6 @@ public class rdftests extends CmdMain { TextTestRunner.run(manifests); } - // Test subsystems. - private static List<Function<ManifestEntry, Runnable>> installed = new ArrayList<>(); - - public static void installTestMaker(Function<ManifestEntry, Runnable> testMaker) { - installed.add(testMaker); - } - - static { - installTestMaker(RiotTests::makeRIOTTest); - installTestMaker(SparqlTests::makeSPARQLTest); - installTestMaker(SemanticsTests::makeSemanticsTest); - } - private static String name = "Apache Jena"; private static String releaseVersion = ARQ.VERSION; private static String homepageStr = "https://jena.apache.org/";; diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java index 492549108d..88ca5069f9 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java @@ -64,7 +64,7 @@ import org.xml.sax.SAXParseException; */ public class XMLLiteralType extends BaseDatatype implements RDFDatatype { - public static String XMLLiteralTypeURI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral";; + public static final String XMLLiteralTypeURI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral";; /** * Singleton instance of the rdf:XMLLiteral datatype.
