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
The following commit(s) were added to refs/heads/main by this push: new 031826b7de JENA-2320: Tidy up after PR#1256 new 2ac29734b3 Merge pull request #1437 from afs/shacl-cleanup 031826b7de is described below commit 031826b7defbc89cb027fd9a13fcb76dc5a7a90a Author: Andy Seaborne <a...@apache.org> AuthorDate: Mon Jul 11 11:29:15 2022 +0100 JENA-2320: Tidy up after PR#1256 --- .../apache/jena/shacl/engine/constraint/DisjointConstraint.java | 8 -------- .../org/apache/jena/shacl/engine/constraint/EqualsConstraint.java | 1 - .../apache/jena/shacl/engine/constraint/LessThanConstraint.java | 1 - .../jena/shacl/engine/constraint/LessThanOrEqualsConstraint.java | 4 ---- .../jena/shacl/validation/HandlerBasedValidationListener.java | 5 ++++- .../ConstraintEvaluatedOnPathNodesWithCompareNodesEvent.java | 1 + .../jena/shacl/validation/event/ImmutableLazyCollectionCopy.java | 1 + .../apache/jena/shacl/validation/event/ImmutableLazySetCopy.java | 1 + .../java/org/apache/jena/shacl/tests/ValidationListenerTests.java | 2 -- 9 files changed, 7 insertions(+), 17 deletions(-) diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DisjointConstraint.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DisjointConstraint.java index c51ae63f51..5728d98767 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DisjointConstraint.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/DisjointConstraint.java @@ -30,17 +30,9 @@ import org.apache.jena.riot.out.NodeFormatter; import org.apache.jena.shacl.engine.ValidationContext; import org.apache.jena.shacl.parser.ConstraintVisitor; import org.apache.jena.shacl.parser.Shape; -import org.apache.jena.shacl.validation.event.ConstraintEvaluatedOnPathNodesWithCompareNodesEvent; -import org.apache.jena.shacl.validation.event.ConstraintEvaluatedOnSinglePathNodeWithCompareNodesEvent; import org.apache.jena.shacl.vocabulary.SHACL; import org.apache.jena.sparql.path.Path; -import java.util.Objects; -import java.util.Set; - -import static org.apache.jena.shacl.compact.writer.CompactOut.compactArrayNodes; -import static org.apache.jena.shacl.lib.ShLib.displayStr; - /** sh:disjoint */ public class DisjointConstraint extends ConstraintPairwise { diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/EqualsConstraint.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/EqualsConstraint.java index c58e7230cd..cf7d98de7d 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/EqualsConstraint.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/EqualsConstraint.java @@ -24,7 +24,6 @@ import org.apache.jena.riot.out.NodeFormatter; import org.apache.jena.shacl.engine.ValidationContext; import org.apache.jena.shacl.parser.ConstraintVisitor; import org.apache.jena.shacl.parser.Shape; -import org.apache.jena.shacl.validation.event.ConstraintEvaluatedOnSinglePathNodeWithCompareNodesEvent; import org.apache.jena.shacl.vocabulary.SHACL; import org.apache.jena.sparql.path.Path; diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanConstraint.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanConstraint.java index 7f7240c63a..00a9306f42 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanConstraint.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanConstraint.java @@ -30,7 +30,6 @@ import org.apache.jena.riot.out.NodeFormatter; import org.apache.jena.shacl.engine.ValidationContext; import org.apache.jena.shacl.parser.ConstraintVisitor; import org.apache.jena.shacl.parser.Shape; -import org.apache.jena.shacl.validation.event.ConstraintEvaluatedOnSinglePathNodeWithSingleCompareNodeEvent; import org.apache.jena.shacl.vocabulary.SHACL; import org.apache.jena.sparql.expr.Expr; import org.apache.jena.sparql.path.Path; diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanOrEqualsConstraint.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanOrEqualsConstraint.java index 785cdd90cf..be77836c8f 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanOrEqualsConstraint.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/LessThanOrEqualsConstraint.java @@ -30,10 +30,6 @@ import org.apache.jena.riot.out.NodeFormatter; import org.apache.jena.shacl.engine.ValidationContext; import org.apache.jena.shacl.parser.ConstraintVisitor; import org.apache.jena.shacl.parser.Shape; -import org.apache.jena.shacl.validation.event.AbstractConstraintEvaluationEvent; -import org.apache.jena.shacl.validation.event.ConstraintEvaluatedOnFocusNodeWithCompareNodesEvent; -import org.apache.jena.shacl.validation.event.ConstraintEvaluatedOnPathNodesWithCompareNodesEvent; -import org.apache.jena.shacl.validation.event.ConstraintEvaluatedOnSinglePathNodeWithSingleCompareNodeEvent; import org.apache.jena.shacl.vocabulary.SHACL; import org.apache.jena.sparql.expr.Expr; import org.apache.jena.sparql.path.Path; diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/HandlerBasedValidationListener.java b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/HandlerBasedValidationListener.java index ad002ffbb5..65fc5c14f7 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/HandlerBasedValidationListener.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/HandlerBasedValidationListener.java @@ -80,7 +80,8 @@ public class HandlerBasedValidationListener implements ValidationListener { eventHandlers.compute(eventType, (k, l) -> { List<Consumer<ValidationEvent>> ret = Optional.ofNullable(l).orElse(new ArrayList<>()); //noinspection unchecked - ret.add((Consumer<ValidationEvent>) handler); + @SuppressWarnings("unchecked") + boolean b = ret.add((Consumer<ValidationEvent>) handler); return ret; }); handlerSelectionStrategy.onNewHandlerRegistered(eventType); @@ -213,10 +214,12 @@ public class HandlerBasedValidationListener implements ValidationListener { public static class HandlerBuilder<T extends ValidationEvent> implements HandlerCustomizer<T>, HandlerConditionCustomizer<T> { private Predicate<ValidationEvent> predicate = null; private Consumer<T> handler = null; + @Override public HandlerBuilder<T> iff(Predicate<ValidationEvent> predicate){ this.predicate = predicate; return this; } + @Override public void handle(Consumer<T> handler) { this.handler = handler; } diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ConstraintEvaluatedOnPathNodesWithCompareNodesEvent.java b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ConstraintEvaluatedOnPathNodesWithCompareNodesEvent.java index 7a99ec86f8..d5bbbb7cec 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ConstraintEvaluatedOnPathNodesWithCompareNodesEvent.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ConstraintEvaluatedOnPathNodesWithCompareNodesEvent.java @@ -41,6 +41,7 @@ public class ConstraintEvaluatedOnPathNodesWithCompareNodesEvent extends Constra this.compareNodes = new ImmutableLazySetCopy<>(compareNodes); } + @Override public Set<Node> getCompareNodes() { return compareNodes.get(); } diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazyCollectionCopy.java b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazyCollectionCopy.java index 0b4c63e888..f89199a6b9 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazyCollectionCopy.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazyCollectionCopy.java @@ -36,6 +36,7 @@ public class ImmutableLazyCollectionCopy<T> { return copy.updateAndGet(existingCopy -> existingCopy == null ? Collections.unmodifiableCollection(new ArrayList<>(original)) : existingCopy); } + @Override public String toString(){ return Optional.ofNullable(copy.get()).orElse(original).toString(); } diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazySetCopy.java b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazySetCopy.java index 0a8ff91353..d43687bf4f 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazySetCopy.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/event/ImmutableLazySetCopy.java @@ -34,6 +34,7 @@ public class ImmutableLazySetCopy<T> { return copy.updateAndGet(existingCopy -> existingCopy == null ? Set.copyOf(original) : existingCopy ); } + @Override public String toString(){ return Optional.ofNullable(copy.get()).orElse(original).toString(); } diff --git a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/ValidationListenerTests.java b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/ValidationListenerTests.java index e32d0e2e1b..67e739700e 100644 --- a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/ValidationListenerTests.java +++ b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/ValidationListenerTests.java @@ -55,7 +55,6 @@ public class ValidationListenerTests { this.predicateTree = predicateTree; } - @SuppressWarnings("HttpUrlsUsage") @Parameterized.Parameters public static Collection<Object[]> data() { return Arrays.asList(new Object[][] { @@ -299,7 +298,6 @@ public class ValidationListenerTests { return passed; } - @SuppressWarnings("unused") public String getMessage() { return message; }