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 8018231fb32f2c658bf84f37cc3124132ef0286d Author: Andy Seaborne <[email protected]> AuthorDate: Sun Jan 12 18:27:38 2025 +0000 Edit javadoc, address warnings. --- jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java | 2 +- .../src/main/java/org/apache/jena/sparql/algebra/walker/Walker.java | 2 +- jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java | 4 +--- .../src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java | 2 +- .../jena/sparql/syntax/syntaxtransform/ElementTransformSubst.java | 3 ++- .../geosparql/implementation/jts/CustomCoordinateSequenceTest.java | 1 - .../src/main/java/org/apache/jena/ontapi/model/MutableModel.java | 3 +++ .../src/main/java/org/apache/jena/tdb1/solver/OpExecutorTDB1.java | 2 +- .../src/main/java/org/apache/jena/tdb2/solver/OpExecutorTDB2.java | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java index 9be1eb36ab..72823be1f3 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java @@ -409,7 +409,7 @@ public class OpAsQuery { private static void processAssigns(List<OpAssign> assigns, BiConsumer<Var, Expr> action) { assigns.forEach(assign->{ - assign.getVarExprList().forEachExpr(action) ; + assign.getVarExprList().forEachVarExpr(action) ; }); } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/Walker.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/Walker.java index 9e086535de..65267b8e1c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/Walker.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/Walker.java @@ -129,7 +129,7 @@ public class Walker { public static void walk(VarExprList varExprList, OpVisitor opVisitor, ExprVisitor exprVisitor) { if ( varExprList == null ) return; - varExprList.forEachExpr((v,e)->walk(e,opVisitor, exprVisitor)); + varExprList.forEachExpr((v,e)->walk(e, opVisitor, exprVisitor)); } private static OpVisitor nullOpVisitor = new OpVisitorBase(); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java index 4df9d91cbb..185eb23f25 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java @@ -66,7 +66,7 @@ public class VarExprList { /** * Call the action for each (variable, expression) defined. * Not called when there is no expression, just a variable. - * (c.f. {@link #forEachVarExpr}). Not order preserving. + * (c.f. {@link #forEachVarExpr}). */ public void forEachExpr(BiConsumer<Var, Expr> action) { exprs.forEach(action); @@ -75,8 +75,6 @@ public class VarExprList { /** * Call the action for each variable, in order. * The expression may be null. - * Called when there is no expression, just a variable (c.f. - * {@link #forEachExpr}). */ public void forEachVarExpr(BiConsumer<Var, Expr> action) { // * See {@link #forEach} diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java index 53c697b399..b315c69ee0 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java @@ -33,7 +33,7 @@ import org.apache.jena.sparql.serializer.SerializationContext; /** * Group aggregation functions calculated a value during grouping and placed in the - * output binding. This class is relationship of an aggregation expression and that + * output binding. This class is the relationship of an aggregation expression and that * variable. Evaluation returns the variable's bound value. */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformSubst.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformSubst.java index 22d40bf58f..8e98b50509 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformSubst.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformSubst.java @@ -31,7 +31,8 @@ import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.ElementPathBlock; import org.apache.jena.sparql.syntax.ElementTriplesBlock; -/** An {@link ElementTransform} which replaces occurrences of a variable with a Node value. +/** + * An {@link ElementTransform} which replaces occurrences of a variable with a Node value. * Because a {@link Var} is a subclass of {@link Node_Variable} which is a {@link Node}, * this includes variable renaming. * <p> diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequenceTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequenceTest.java index 836d4b4655..0aec3ed755 100644 --- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequenceTest.java +++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CustomCoordinateSequenceTest.java @@ -74,7 +74,6 @@ public class CustomCoordinateSequenceTest { @Test public void testGetCoordinate_3DSpatial_1DMeasure() { CustomCoordinateSequence sequence = new CustomCoordinateSequence(CoordinateSequenceDimensions.XYZM, "1 1 1 1, 2 2 2 2, 3 3 3 3"); - System.out.println(sequence); Coordinate coord = new CoordinateXYZM(); int index = 1; diff --git a/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/MutableModel.java b/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/MutableModel.java index 92d04d229f..6b89e5940b 100644 --- a/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/MutableModel.java +++ b/jena-ontapi/src/main/java/org/apache/jena/ontapi/model/MutableModel.java @@ -121,6 +121,7 @@ interface MutableModel<R extends Model> extends Model { * @param listener {@link ModelChangedListener}, not null * @return this model, for cascading */ + @Override R register(ModelChangedListener listener); /** @@ -131,6 +132,7 @@ interface MutableModel<R extends Model> extends Model { * * @param listener {@link ModelChangedListener}, not null */ + @Override R unregister(ModelChangedListener listener); /** @@ -141,5 +143,6 @@ interface MutableModel<R extends Model> extends Model { * @see ModelChangedListener * @see org.apache.jena.graph.GraphEvents */ + @Override R notifyEvent(Object event); } diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/OpExecutorTDB1.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/OpExecutorTDB1.java index 5fe9588a4b..b41409d9f4 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/OpExecutorTDB1.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/OpExecutorTDB1.java @@ -249,7 +249,7 @@ public class OpExecutorTDB1 extends OpExecutor // The Op may be a sequence due to TransformFilterPlacement // so we need to do a full execution step, not go straight to the SolverLib. - ExecutionContext ec2 = new ExecutionContext(execCxt); + ExecutionContext ec2 = ExecutionContext.copy(execCxt); ec2.setExecutor(plainFactory); // Solve without going through this executor again. diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/OpExecutorTDB2.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/OpExecutorTDB2.java index 3ce85e95c9..06f091bf07 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/OpExecutorTDB2.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/OpExecutorTDB2.java @@ -263,7 +263,7 @@ public class OpExecutorTDB2 extends OpExecutor // The Op may be a sequence due to TransformFilterPlacement // so we need to do a full execution step, not go straight to the SolverLib. - ExecutionContext ec2 = new ExecutionContext(execCxt); + ExecutionContext ec2 = ExecutionContext.copy(execCxt); ec2.setExecutor(plainFactory); // Solve without going through this executor again.
