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 9be1eb36ab2..72823be1f38 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 @@ private static void processExtends(List ext, BiConsumer act private static void processAssigns(List assigns, BiConsumer 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 9e086535dee..65267b8e1c7 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 static void walk(VarExprList varExprList, ExprVisitor exprVisitor) { 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 4df9d91cbbb..185eb23f255 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 Map getExprs() { /** * 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 action) { exprs.forEach(action); @@ -75,8 +75,6 @@ public void forEachExpr(BiConsumer action) { /** * 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 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 53c697b399f..b315c69ee0b 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 @@ /** * 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 22d40bf58f0..8e98b50509b 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.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. *

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 836d4b46555..0aec3ed755a 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 void testGetCoordinate_3DSpatial_0DMeasure() { @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 92d04d229f0..6b89e5940b8 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 extends Model { * @param listener {@link ModelChangedListener}, not null * @return this model, for cascading */ + @Override R register(ModelChangedListener listener); /** @@ -131,6 +132,7 @@ interface MutableModel extends Model { * * @param listener {@link ModelChangedListener}, not null */ + @Override R unregister(ModelChangedListener listener); /** @@ -141,5 +143,6 @@ interface MutableModel 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 5fe9588a4bc..b41409d9f49 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 @@ private static QueryIterator plainExecute(Op op, QueryIterator input, ExecutionC // 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 3ce85e95c90..06f091bf07f 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 @@ private static QueryIterator plainExecute(Op op, QueryIterator input, ExecutionC // 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.