Reorder NodeConstraint arguments

Author: atextor

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

@@ -121,7 +121,7 @@ private record ShapeContext(Statement statement, Optional<Path> path) {
          .put( SHACL.and(), context -> new AndConstraint( nestedConstraintList( context.statement(), context.path() ) ) )
          .put( SHACL.or(), context -> new OrConstraint( nestedConstraintList( context.statement(), context.path() ) ) )
          .put( SHACL.xone(), context -> new XoneConstraint( nestedConstraintList( context.statement(), context.path() ) ) )
-         .put( SHACL.node(), context -> new NodeConstraint( context.path(), nodeShape( context.statement().getObject().asResource() ) ) )
+         .put( SHACL.node(), context -> new NodeConstraint( nodeShape( context.statement().getObject().asResource() ), context.path() ) )
          .put( SHACL.in(), context -> new AllowedValuesConstraint( context.statement().getResource().as( RDFList.class ).asJavaList() ) )
          .put( SHACL.closed(), context -> {
             boolean closed = context.statement().getBoolean();

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

@@ -27,7 +27,7 @@
  * Implements <a href="https://www.w3.org/TR/shacl/#NodeConstraintComponent">sh:node</a>
  * @param targetShape the node shape this sh:node refers to
  */
-public record NodeConstraint(Optional<Path> path, Shape.Node targetShape) implements Constraint {
+public record NodeConstraint(Shape.Node targetShape, Optional<Path> path) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       // Having a path means that the node constraint is used inside a property shape, i.e., it applies to the element the