Remove deprecated code

Author: atextor

core/esmf-aspect-meta-model-java/buildSrc/main/groovy/CreateLegacyMetaModel.groovy

@@ -72,23 +72,6 @@ public class AspectModelLoader {
    private AspectModelLoader() {
    }
 
-   /**
-    * Creates an {@link Aspect} instance from a Turtle input model.
-    *
-    * @param versionedModel The RDF model representation of the Aspect model
-    * @return A {@link Try} containing the {@link Aspect} on success and an {@link InvalidRootElementCountException}
-    *       (when the Aspect model does not contain exactly one Aspect) or {@link InvalidVersionException}
-    *       (when the meta model version is not supported by the Aspect loader) on failure
-    * @deprecated Use {@link #getSingleAspect(VersionedModel)} instead to retain the same semantics, but better use {@link #getElements(VersionedModel)}
-    * instead to also properly handle models that contain not exactly one Aspect
-    *
-    * @see AspectModelResolver
-    */
-   @Deprecated( forRemoval = true )
-   public static Try<Aspect> fromVersionedModel( final VersionedModel versionedModel ) {
-      return getSingleAspect( versionedModel );
-   }
-
    private static void validateNamespaceOfCustomUnits( final SAMM samm, final Model rawModel ) {
       final List<String> customUnitsWithSammNamespace = new ArrayList<>();
       rawModel.listStatements( null, RDF.type, samm.Unit() )
@@ -104,23 +87,6 @@ private static void validateNamespaceOfCustomUnits( final SAMM samm, final Model
       }
    }
 
-   /**
-    * Creates an {@link Aspect} instance from a Turtle input model.
-    *
-    * @param versionedModel The RDF model representation of the Aspect model
-    * @return The Aspect
-    * @deprecated use {@link #getSingleAspectUnchecked(VersionedModel)} instead to retain the same semantics, but better use
-    * {@link #getElementsUnchecked(VersionedModel)} instead to also properly handle models that contain not exactly one Aspect
-    * @see #fromVersionedModel(VersionedModel)
-    */
-   @Deprecated( forRemoval = true )
-   public static Aspect fromVersionedModelUnchecked( final VersionedModel versionedModel ) {
-      return fromVersionedModel( versionedModel ).getOrElseThrow( cause -> {
-         LOG.error( "Could not load Aspect", cause );
-         throw new AspectLoadingException( cause );
-      } );
-   }
-
    /**
     * Loads elements from an RDF model that possibly contains multiple namespaces, and organize the result into a
     * collection of {@link ModelNamespace}. Use this method only when you expect the RDF model to contain more than

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/loader/AspectModelLoader.java

@@ -32,10 +32,6 @@
          <groupId>org.apache.jena</groupId>
          <artifactId>jena-core</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.topbraid</groupId>
-         <artifactId>shacl</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.eclipse.esmf</groupId>
          <artifactId>esmf-semantic-aspect-meta-model</artifactId>

core/esmf-aspect-model-validator/pom.xml

@@ -28,10 +28,16 @@
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprTransform;
+import org.apache.jena.sparql.expr.ExprTransformer;
+import org.apache.jena.sparql.syntax.syntaxtransform.ElementTransform;
+import org.apache.jena.sparql.syntax.syntaxtransform.ElementTransformSubst;
+import org.apache.jena.sparql.syntax.syntaxtransform.ExprTransformNodeElement;
+import org.apache.jena.sparql.syntax.syntaxtransform.QueryTransformOps;
 import org.eclipse.esmf.aspectmodel.shacl.violation.EvaluationContext;
 import org.eclipse.esmf.aspectmodel.shacl.violation.SparqlConstraintViolation;
 import org.eclipse.esmf.aspectmodel.shacl.violation.Violation;
-import org.topbraid.jenax.util.JenaUtil;
 
 /**
  * Implements <a href="https://www.w3.org/TR/shacl/#sparql-constraints">sh:sparql</a>
@@ -43,7 +49,7 @@ public record SparqlConstraint(String message, Query query) implements Constrain
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
       final Model model = context.element().getModel();
       final Map<Var, Node> substitutions = Map.of( Var.alloc( "this" ), context.element().asNode() );
-      final Query query1 = JenaUtil.queryWithSubstitutions( query, substitutions );
+      final Query query1 = substituteVariablesInQuery( query, substitutions );
 
       final List<Violation> results = new ArrayList<>();
       try ( final QueryExecution queryExecution = QueryExecutionFactory.create( query1, model ) ) {
@@ -68,4 +74,28 @@ public String name() {
    public <T> T accept( final Visitor<T> visitor ) {
       return visitor.visitSparqlConstraint( this );
    }
+
+   /**
+    * Perform proper query substitutions; unfortunately the substutions done by {@see org.apache.jena.query.ParameterizedSparqlString} are not always correct.
+    * @param query the query
+    * @param substitutions the map of substitutions to perform
+    * @return the updated query
+    */
+   private Query substituteVariablesInQuery( final Query query, final Map<Var, Node> substitutions ) {
+      final Query result = QueryTransformOps.transform( query, substitutions );
+
+      if ( result.hasHaving() ) {
+         final ElementTransform elementTransform = new ElementTransformSubst( substitutions );
+         final ExprTransform exprTransform = new ExprTransformNodeElement( node -> substitutions.getOrDefault( node, node ), elementTransform );
+         final List<Expr> havingExpressions = result.getHavingExprs();
+         for ( int i = 0; i < havingExpressions.size(); i++ ) {
+            final Expr expression = havingExpressions.get( i );
+            final Expr newExpression = ExprTransformer.transform( exprTransform, expression );
+            if ( newExpression != expression ) {
+               havingExpressions.set( i, newExpression );
+            }
+         }
+      }
+      return result;
+   }
 }