Incorporate PR suggestions

Author: atextor

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

@@ -43,12 +43,14 @@
 
 /**
  * Rust-like message formatter. Formatted messages look something like the following example:
- *
+ * <br/><br/>
+ * <pre>
  * ---> Error at line 11 column 20
  *    |
  * 11 |   :testProperty [ a :SomethingElse ]
  *    |                     ^^^^^^^^^^^^^^ Property ':testProperty' on ':Foo' has type ':SomethingElse', but only ':TestClass2' is allowed.
  *    |
+ * </pre>
  */
 public class RustLikeFormatter {
 
@@ -228,13 +230,13 @@ private boolean formatNode( final RDFNode node ) {
       final SmartToken nodePosition = extractToken( node );
       if ( null == nodePosition ) {
          // ugly special case: Jena internally replaces the RDF keyword 'a' with 'rdf:type' without position information
-         if ( node.asNode().equals( NodeConst.nodeRDFType ) ) {
+         if ( NodeConst.nodeRDFType.equals( node.asNode() ) ) {
             spacedIfPossible( "a " );
          }
-         if ( node.asNode().equals( NodeConst.nodeTrue ) ) {
+         if ( NodeConst.nodeTrue.equals( node.asNode() ) ) {
             spacedIfPossible( "true" );
          }
-         if ( node.asNode().equals( NodeConst.nodeFalse ) ) {
+         if ( NodeConst.nodeFalse.equals( node.asNode() ) ) {
             spacedIfPossible( "false" );
          }
          return true;

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

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+ *
+ * See the AUTHORS file(s) distributed with this work for additional
+ * information regarding authorship.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+package org.eclipse.esmf.aspectmodel.shacl;
+
+import java.io.Serial;
+
+/**
+ * This exception is thrown when the validation process fails
+ */
+public class ShaclValidationException extends RuntimeException {
+   @Serial
+   private static final long serialVersionUID = 7771592676699681415L;
+
+   public ShaclValidationException( final String message ) {
+      super( message );
+   }
+}

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

@@ -126,7 +126,7 @@ private Map<Resource, List<Shape.Node>> findSparqlTargets( final Model model ) {
       final Map<Resource, List<Shape.Node>> resourceShapes = new HashMap<>();
       for ( final Shape.Node shape : targetSparqlShapes() ) {
          final List<Resource> shapeTargets = querySparqlTargets( model, shape.attributes().targetSparql().orElseThrow( () ->
-               new RuntimeException( "SPARQL node shape is missing a target SPARQL expression" ) ) );
+               new ShaclValidationException( "SPARQL node shape is missing a target SPARQL expression" ) ) );
          for ( final Resource node : shapeTargets ) {
             addResourceShape( resourceShapes, node, shape );
          }