Fix formatting and remove unused imports

Author: atextor

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/AllowedLanguagesConstraint.java

@@ -16,16 +16,18 @@
 import java.util.List;
 
 import org.apache.jena.rdf.model.RDFNode;
+
 import org.eclipse.esmf.aspectmodel.shacl.Shape;
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.LanguageFromListViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#LanguageInConstraintComponent">sh:languageIn</a>
+ *
  * @param allowedLanguages the list of allowed language tags
  */
-public record AllowedLanguagesConstraint(List<String> allowedLanguages) implements Constraint {
+public record AllowedLanguagesConstraint( List<String> allowedLanguages ) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       final List<Violation> nodeKindViolations = new NodeKindConstraint( Shape.NodeKind.Literal ).apply( rdfNode, context );

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/AllowedValuesConstraint.java

@@ -16,15 +16,17 @@
 import java.util.List;
 
 import org.apache.jena.rdf.model.RDFNode;
+
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.ValueFromListViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#InConstraintComponent">sh:in</a> *
+ *
  * @param allowedValues the list of allowed values
  */
-public record AllowedValuesConstraint(List<RDFNode> allowedValues) implements Constraint {
+public record AllowedValuesConstraint( List<RDFNode> allowedValues ) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       return allowedValues.contains( rdfNode ) ?

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/AndConstraint.java

@@ -17,13 +17,14 @@
 import java.util.stream.Collectors;
 
 import org.apache.jena.rdf.model.RDFNode;
+
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#AndConstraintComponent">sh:and</a>
  */
-public record AndConstraint(List<Constraint> constraints) implements Constraint {
+public record AndConstraint( List<Constraint> constraints ) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       return constraints().stream().flatMap( constraint -> constraint.apply( rdfNode, context ).stream() ).collect( Collectors.toList() );

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/ClassConstraint.java

@@ -20,6 +20,7 @@
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.vocabulary.RDF;
+
 import org.eclipse.esmf.aspectmodel.shacl.RdfTypes;
 import org.eclipse.esmf.aspectmodel.shacl.Shape;
 import org.eclipse.esmf.aspectmodel.shacl.violation.ClassTypeViolation;
@@ -30,9 +31,10 @@
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#ClassConstraintComponent">sh:class</a>
+ *
  * @param allowedClass the allowed class
  */
-public record ClassConstraint(Resource allowedClass) implements Constraint {
+public record ClassConstraint( Resource allowedClass ) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       if ( !rdfNode.isResource() ) {
@@ -41,13 +43,15 @@ public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext con
       final Resource resource = rdfNode.asResource();
       final StmtIterator iterator = context.resolvedModel().listStatements( resource, RDF.type, (RDFNode) null );
       if ( !iterator.hasNext() ) {
-         return List.of( new MissingTypeViolation( context.withElement( resource ).withProperty( RDF.type ).withOffendingStatements( List.of() ) ) );
+         return List.of(
+               new MissingTypeViolation( context.withElement( resource ).withProperty( RDF.type ).withOffendingStatements( List.of() ) ) );
       }
       final Statement typeAssertionStatement = iterator.next();
       final RDFNode assertedTypeNode = typeAssertionStatement.getObject();
       if ( !assertedTypeNode.isResource() ) {
          return List.of(
-               new NodeKindViolation( context.withElement( resource ).withProperty( RDF.type ).withOffendingStatements( List.of( typeAssertionStatement ) ),
+               new NodeKindViolation(
+                     context.withElement( resource ).withProperty( RDF.type ).withOffendingStatements( List.of( typeAssertionStatement ) ),
                      Shape.NodeKind.BlankNodeOrIRI,
                      Shape.NodeKind.forNode( rdfNode ) ) );
       }

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/ClosedConstraint.java

@@ -21,19 +21,20 @@
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.Statement;
+
 import org.eclipse.esmf.aspectmodel.shacl.Shape;
 import org.eclipse.esmf.aspectmodel.shacl.path.FirstEffectiveProperty;
-import org.eclipse.esmf.aspectmodel.shacl.path.PathNodeRetriever;
 import org.eclipse.esmf.aspectmodel.shacl.violation.ClosedViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.NodeKindViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#ClosedConstraintComponent">sh:closed</a>
+ *
  * @param ignoredProperties allowed ignored properties
  */
-public record ClosedConstraint(Set<Property> ignoredProperties) implements Constraint {
+public record ClosedConstraint( Set<Property> ignoredProperties ) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       if ( !rdfNode.isResource() ) {
@@ -46,7 +47,9 @@ public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext con
       final Resource resource = rdfNode.asResource();
       final FirstEffectiveProperty allowedFirstProperties = new FirstEffectiveProperty();
       final Set<Property> allowedProperties = shapeNode.properties().stream()
-            .flatMap( property -> property.path().accept( resource, allowedFirstProperties ).stream() ).collect( Collectors.toSet() );
+            .flatMap( property -> property.path().accept( resource, allowedFirstProperties ).stream() )
+            .filter( property -> !ignoredProperties.contains( property ) )
+            .collect( Collectors.toSet() );
 
       return resource.getModel().listStatements( resource, null, (RDFNode) null )
             .mapWith( Statement::getPredicate )

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/Constraint.java

@@ -16,10 +16,10 @@
 import java.util.List;
 import java.util.function.BiFunction;
 
-import org.apache.jena.rdf.model.RDFNode;
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
+import org.apache.jena.rdf.model.RDFNode;
 /**
  * Represents a SHACL constraint component as a function that takes the <a href="https://www.w3.org/TR/shacl/#value-nodes">value node</a> as input
  * and returns a (possibly empty) list of violations.

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/DatatypeConstraint.java

@@ -17,6 +17,7 @@
 
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.RDFNode;
+
 import org.eclipse.esmf.aspectmodel.shacl.Shape;
 import org.eclipse.esmf.aspectmodel.shacl.violation.DatatypeViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
@@ -25,9 +26,10 @@
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#DatatypeConstraintComponent">sh:datatype</a>
+ *
  * @param allowedTypeUri the allowed data type URI
  */
-public record DatatypeConstraint(String allowedTypeUri) implements Constraint {
+public record DatatypeConstraint( String allowedTypeUri ) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       if ( !rdfNode.isLiteral() ) {

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/DisjointConstraint.java

@@ -17,15 +17,17 @@
 
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;
+
 import org.eclipse.esmf.aspectmodel.shacl.violation.DisjointViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#DisjointConstraintComponent">sh:disjoint</a>
+ *
  * @param otherProperty the property of which the value must not match the given property value
  */
-public record DisjointConstraint(Property otherProperty) implements Constraint {
+public record DisjointConstraint( Property otherProperty ) implements Constraint {
    @Override
    public boolean canBeUsedOnNodeShapes() {
       return false;

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/EqualsConstraint.java

@@ -17,15 +17,17 @@
 
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;
+
 import org.eclipse.esmf.aspectmodel.shacl.violation.EqualsViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#EqualsConstraintComponent">sh:equals</a>
+ *
  * @param otherProperty this value nodes' value must be less than otherProperty's value
  */
-public record EqualsConstraint(Property otherProperty) implements Constraint {
+public record EqualsConstraint( Property otherProperty ) implements Constraint {
    @Override
    public boolean canBeUsedOnNodeShapes() {
       return false;

core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/HasValueConstraint.java

@@ -16,15 +16,17 @@
 import java.util.List;
 
 import org.apache.jena.rdf.model.RDFNode;
+
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.InvalidValueViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#HasValueConstraintComponent">sh:hasValue</a>
+ *
  * @param allowedValue the allowed value
  */
-public record HasValueConstraint(RDFNode allowedValue) implements Constraint {
+public record HasValueConstraint( RDFNode allowedValue ) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       return rdfNode.equals( allowedValue ) ?