Fix code smells and typos

atextor · atextor · commit 19d4920e46ab · 2023-05-30T13:41:36.000+02:00
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/RustLikeFormatter.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/RustLikeFormatter.java
@@ -260,15 +260,16 @@ private boolean isList( final Model model, final RDFNode node ) {
       return node.equals( RDF.nil ) || (node.isResource() && model.contains( node.asResource(), RDF.rest, (RDFNode) null ));
    }
 
-   private Statement findListHead( Statement listElement ) {
+   private Statement findListHead( final Statement listElement ) {
+      Statement listElementStatement = listElement;
       while ( true ) {
-         final StmtIterator iter = listElement.getModel().listStatements( null, RDF.rest, listElement.getSubject() );
+         final StmtIterator iter = listElementStatement.getModel().listStatements( null, RDF.rest, listElementStatement.getSubject() );
          if ( !iter.hasNext() ) {
             break;
          }
-         listElement = iter.nextStatement();
+         listElementStatement = iter.nextStatement();
       }
-      return listElement;
+      return listElementStatement;
    }
 
    private boolean formatList( final RDFNode listNode ) {
@@ -347,17 +348,17 @@ private void formatText( final String reconstructedText ) {
       currentColumn += reconstructedText.length();
    }
 
-   private static SmartToken extractToken( final RDFNode node ) {
-      final Node n = node.asNode();
-      if ( n instanceof AnyNode an ) {
+   private static SmartToken extractToken( final RDFNode rdfNode ) {
+      final Node node = rdfNode.asNode();
+      if ( node instanceof final AnyNode an ) {
          return an.getToken();
-      } else if ( n instanceof BlankNode bn ) {
+      } else if ( node instanceof final BlankNode bn ) {
          return bn.getToken();
-      } else if ( n instanceof LiteralNode ln ) {
+      } else if ( node instanceof final LiteralNode ln ) {
          return ln.getToken();
-      } else if ( n instanceof UriNode un ) {
+      } else if ( node instanceof final UriNode un ) {
          return un.getToken();
-      } else if ( n instanceof VariableNode vn ) {
+      } else if ( node instanceof final VariableNode vn ) {
          return vn.getToken();
       } else {
          return null;
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/SHACL.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/SHACL.java
@@ -22,7 +22,7 @@
  * Vocabulary for the Shapes Constraint Language (SHACL)
  */
 public class SHACL implements Namespace {
-   public final String NS = "http://www.w3.org/ns/shacl#";
+   public static final String NS = "http://www.w3.org/ns/shacl#";
 
    @Override
    public String getUri() {
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/ShaclValidator.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/ShaclValidator.java
@@ -34,9 +34,6 @@
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.vocabulary.RDF;
 import org.eclipse.esmf.aspectmodel.resolver.services.VersionedModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.eclipse.esmf.aspectmodel.shacl.constraint.Constraint;
 import org.eclipse.esmf.aspectmodel.shacl.constraint.MinCountConstraint;
 import org.eclipse.esmf.aspectmodel.shacl.constraint.SparqlConstraint;
@@ -52,7 +49,6 @@
  * results only for this specific resource.
  */
 public class ShaclValidator {
-   private static final Logger LOG = LoggerFactory.getLogger( ShaclValidator.class );
    private final List<Shape.Node> shapes;
    private final Map<Resource, List<Shape.Node>> shapesWithClassTargets;
    private final Model shapesModel;
@@ -78,7 +74,7 @@ public ShaclValidator( final Model shapesModel ) {
 
    /**
     * Validates a model element using the SHACL shapes the validator was initialized with.
-    * If you have more than one element to validate, prefer the method {@link this.validateElements( final List<Resource>  )} to calling this method in a loop
+    * If you have more than one element to validate, prefer the method {@link #validateElements(List)} to calling this method in a loop
     * for better performance.
     * {@link Resource#getModel()} on the element must not return null, i.e., the resource may not be created using
     * {@link org.apache.jena.rdf.model.ResourceFactory#createProperty(String)}, but instead must be created via {@link Model#createResource(String)}.
@@ -129,7 +125,8 @@ public List<Violation> validateModel( final VersionedModel model ) {
    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().get() );
+         final List<Resource> shapeTargets = querySparqlTargets( model, shape.attributes().targetSparql().orElseThrow( () ->
+               new RuntimeException( "SPARQL node shape is missing a target SPARQL expression" ) ) );
          for ( final Resource node : shapeTargets ) {
             addResourceShape( resourceShapes, node, shape );
          }
@@ -161,7 +158,7 @@ private List<Resource> querySparqlTargets( final Model model, final Query query
    }
 
    public List<Violation> validateElements( final List<Resource> elements ) {
-      final Map<Resource, List<Shape.Node>> sparqlTargets = elements.size() > 0 ? findSparqlTargets( elements.get( 0 ).getModel() ) : Map.of();
+      final Map<Resource, List<Shape.Node>> sparqlTargets = !elements.isEmpty() ? findSparqlTargets( elements.get( 0 ).getModel() ) : Map.of();
       return elements.stream().flatMap( element -> validateElement( element, sparqlTargets, element.getModel() ).stream() ).toList();
    }
 
@@ -186,7 +183,7 @@ public List<Violation> validateShapeForElement( final Resource element, final Sh
 
             // MinCount needs to be handled separately: If the property is not used at all on the target node, but a MinCount constraints >= 1
             // exists, a violation must be emitted even though no value for the property exists
-            if ( reachableNodes.isEmpty() && constraint instanceof MinCountConstraint && property.path() instanceof PredicatePath predicatePath ) {
+            if ( reachableNodes.isEmpty() && constraint instanceof MinCountConstraint && property.path() instanceof final PredicatePath predicatePath ) {
                final Property rdfProperty = resolvedModel.createProperty( predicatePath.predicate().getURI() );
                final EvaluationContext context = new EvaluationContext( element, shape, Optional.of( rdfProperty ), List.of(), this, resolvedModel );
                violations.addAll( constraint.apply( null, context ) );
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/Shape.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/Shape.java
@@ -79,7 +79,7 @@ record Node(
    }
 
    /**
-    * Implements <code>sh:property</code>
+    * Implements {@code sh:property}
     */
    record Property(
          Attributes attributes,
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/Target.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/Target.java
@@ -21,7 +21,7 @@
  */
 public sealed interface Target permits Target.Class, Target.Node, Target.ObjectsOf, Target.Sparql, Target.SubjectsOf {
    /**
-    * Implements <code>sh:targetClass</code>. This means that this shape applies to elements of the given class.
+    * Implements {@code sh:targetClass}. This means that this shape applies to elements of the given class.
     * @param class_ the referred class
     */
    record Class(Resource class_) implements Target {
@@ -34,14 +34,14 @@ record ObjectsOf(org.apache.jena.rdf.model.Property property) implements Target
    }
 
    /**
-    * Implements <code>sh:targetSubjectsOf</code>. This means that the shape applies to all elements that use a certain property.
+    * Implements {@code sh:targetSubjectsOf}. This means that the shape applies to all elements that use a certain property.
     * @param property the given property
     */
    record SubjectsOf(org.apache.jena.rdf.model.Property property) implements Target {
    }
 
    /**
-    * Implements <code>sh:target [ a sh:SPARQLTarget ... ]</code>. This means that the shape applies to all elements returned
+    * Implements {@code sh:target [ a sh:SPARQLTarget ... ]}. This means that the shape applies to all elements returned
     * by a given SPARQL query
     * @param query the given SPARQL query
     */
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/ClosedConstraint.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/ClosedConstraint.java
@@ -44,12 +44,6 @@ public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext con
       }
 
       final Resource resource = rdfNode.asResource();
-      final PathNodeRetriever retriever = new PathNodeRetriever();
-      // All statements that lead to (i.e. have as their object) nodes that are reachable via the paths of the property shapes
-      final List<Statement> allowedNodes = shapeNode.properties().stream()
-            .flatMap( property -> property.path().accept( resource, retriever ).stream() )
-            .toList();
-
       final FirstEffectiveProperty allowedFirstProperties = new FirstEffectiveProperty();
       final Set<Property> allowedProperties = shapeNode.properties().stream()
             .flatMap( property -> property.path().accept( resource, allowedFirstProperties ).stream() ).collect( Collectors.toSet() );
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/LessThanConstraint.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/LessThanConstraint.java
@@ -36,6 +36,7 @@ public boolean canBeUsedOnNodeShapes() {
 
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
+      //noinspection DuplicatedCode
       final List<Violation> nodeKindViolations = new NodeKindConstraint( Shape.NodeKind.Literal ).apply( rdfNode, context );
       if ( !nodeKindViolations.isEmpty() ) {
          return nodeKindViolations;
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/LessThanOrEqualsConstraint.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/LessThanOrEqualsConstraint.java
@@ -37,6 +37,7 @@ public boolean canBeUsedOnNodeShapes() {
 
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
+      //noinspection DuplicatedCode
       final List<Violation> nodeKindViolations = new NodeKindConstraint( Shape.NodeKind.Literal ).apply( rdfNode, context );
       if ( !nodeKindViolations.isEmpty() ) {
          return nodeKindViolations;
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/NodeConstraint.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/NodeConstraint.java
@@ -30,18 +30,14 @@
 public record NodeConstraint(Optional<Path> path, Shape.Node targetShape) implements Constraint {
    @Override
    public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext context ) {
-      // An empty path means that the node constraint is used inside a node shape, i.e., we just apply the target shape to the context element
-      if ( path.isEmpty() ) {
-         return context.validator().validateShapeForElement( context.element(), targetShape, context.resolvedModel() );
-      }
-
       // Having a path means that the node constraint is used inside a property shape, i.e., it applies to the element the
       // shape's path points to
-      return path.get().accept( context.element(), context.validator().getPathNodeRetriever() ).stream()
+      return path.map( value -> value.accept( context.element(), context.validator().getPathNodeRetriever() ).stream()
             .filter( statement -> statement.getObject().isResource() )
             .map( Statement::getResource )
             .flatMap( element -> context.validator().validateShapeForElement( element, targetShape, context.resolvedModel() ).stream() )
-            .toList();
+            // An empty path means that the node constraint is used inside a node shape, i.e., we just apply the target shape to the context element
+            .toList() ).orElseGet( () -> context.validator().validateShapeForElement( context.element(), targetShape, context.resolvedModel() ) );
    }
 
    @Override
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/SparqlConstraint.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/SparqlConstraint.java
@@ -74,7 +74,7 @@ public <T> T accept( final Visitor<T> visitor ) {
    }
 
    /**
-    * Perform proper query substitutions; unfortunately the substutions done by {@see org.apache.jena.query.ParameterizedSparqlString} are not always correct.
+    * Perform proper query substitutions; unfortunately the substitutions 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
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/UniqueLangConstraint.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/UniqueLangConstraint.java
@@ -51,7 +51,7 @@ public List<Violation> apply( final RDFNode rdfNode, final EvaluationContext con
             .filter( e -> !seen.add( e ) )
             .collect( Collectors.toSet() );
 
-      return duplicates.size() == 0 ?
+      return duplicates.isEmpty() ?
             List.of() :
             List.of( new UniqueLanguageViolation( context, seen ) );
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/js/JsGraph.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/js/JsGraph.java
@@ -22,20 +22,11 @@
  * The wrapper that wraps a {@link Graph} in the JavaScript context.
  * Implements <a href="https://www.w3.org/TR/shacl-js/#js-api-graphs">SHACL JS Graph</a>.
  */
-public class JsGraph {
-   private final Graph graph;
-
-   public JsGraph( final Graph graph ) {
-      this.graph = graph;
-   }
-
-   public Graph getGraph() {
-      return graph;
-   }
+public record JsGraph(Graph graph) {
 
    @SuppressWarnings( "unused" ) // The find function is called from JavaScript contexts
    public JSTripleIterator find( final Object subject, final Object predicate, final Object object ) {
-      return new JSTripleIterator( getGraph().find( getNode( subject ), getNode( predicate ), getNode( object ) ) );
+      return new JSTripleIterator( graph().find( getNode( subject ), getNode( predicate ), getNode( object ) ) );
    }
 
    private Node getNode( final Object obj ) {
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/js/JsTerm.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/constraint/js/JsTerm.java
@@ -19,7 +19,7 @@
  * Base class for <a href="https://www.w3.org/TR/shacl-js/#js-api-terms">RDF Terms</a>
  */
 public abstract class JsTerm {
-   protected Node node;
+   protected final Node node;
 
    protected JsTerm( final Node node ) {
       this.node = node;
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/fix/ReplaceValue.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/fix/ReplaceValue.java
@@ -21,9 +21,7 @@
 public record ReplaceValue(EvaluationContext context, Literal oldValue, Literal newValue, Optional<String> customDescription) implements Fix {
    @Override
    public String description() {
-      return customDescription.orElseGet( () -> {
-         return String.format( "Change %s's value from %s to %s", context.property(), oldValue, newValue );
-      } );
+      return customDescription.orElseGet( () -> String.format( "Change %s's value from %s to %s", context.property(), oldValue, newValue ) );
    }
 
    @Override
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/path/Path.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/path/Path.java
@@ -48,7 +48,7 @@ default T visitOneOrMorePath( final Resource resource, final OneOrMorePath path
          return visit( resource, path );
       }
 
-      default T visitZeroOrOnePath( Resource resource, final ZeroOrOnePath path ) {
+      default T visitZeroOrOnePath( final Resource resource, final ZeroOrOnePath path ) {
          return visit( resource, path );
       }
    }
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/path/PathNodeRetriever.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/path/PathNodeRetriever.java
@@ -13,7 +13,9 @@
 
 package org.eclipse.esmf.aspectmodel.shacl.path;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -69,7 +71,7 @@ public List<Statement> visitAlternativePath( final Resource resource, final Alte
 
    @Override
    public List<Statement> visitInversePath( final Resource resource, final InversePath path ) {
-      if ( path.path() instanceof PredicatePath predicatePath ) {
+      if ( path.path() instanceof final PredicatePath predicatePath ) {
          return resource.getModel().listStatements( null, predicatePath.predicate(), resource )
                .filterKeep( statement -> statement.getObject().isResource() )
                .mapWith( statement ->
@@ -84,7 +86,7 @@ public List<Statement> visitZeroOrMorePath( final Resource resource, final ZeroO
       final Statement zeroStatement = resource.getModel().createStatement(
             resource, resource.getModel().createProperty( "urn:internal" ), resource );
 
-      final Stack<Statement> toProcess = new Stack<>();
+      final Deque<Statement> toProcess = new ArrayDeque<>();
       final Set<Resource> processedResources = new HashSet<>();
       final List<Statement> result = new ArrayList<>();
       toProcess.push( zeroStatement );
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/DatatypeViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/DatatypeViolation.java
@@ -59,7 +59,6 @@ public List<Fix> fixes() {
       }
 
       final List<Fix> fixes = new ArrayList<>();
-      final Property property = context.property().get();
 
       // value is string but should be langString
       if ( allowedTypeUri.equals( RDF.langString.getURI() ) && actualTypeUri.equals( XSD.xstring.getURI() ) ) {
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/JsConstraintViolation.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/JsConstraintViolation.java
@@ -23,7 +23,7 @@
 /**
  * Represents the violation of a SHACL JavaScript constraint. It provides references to the used
  * <a href="https://www.w3.org/TR/shacl-js/#JSLibrary">SHACL JavaScript library</a> and the JavaScript function name.
- * The bindings map returned by the contraint validation will contains those object returned by the JavaScript function, with its values mapped to
+ * The bindings map returned by the constraint validation will contains those object returned by the JavaScript function, with its values mapped to
  * the corresponding Java types: Scalars (string, numbers) will be native Java types, Named nodes (RDF resources, RDF properties) will be of type
  * {@link Node_URI}, blank nodes will be of type {@link Node_Blank}, RDF literals will be of type {@link Node_Literal}.
  */
@@ -46,9 +46,9 @@ public String message() {
       String interpolatedMessage = bindings.getOrDefault( "message", constraintMessage() ).toString();
       for ( final Map.Entry<String, Object> entry : bindings.entrySet() ) {
          String value = "";
-         if ( entry.getValue() instanceof Node_Literal literal ) {
+         if ( entry.getValue() instanceof final Node_Literal literal ) {
             value = literal.getLiteralLexicalForm();
-         } else if ( entry.getValue() instanceof Node_URI namedNode ) {
+         } else if ( entry.getValue() instanceof final Node_URI namedNode ) {
             value = shortUri( namedNode.getURI() );
          } else if ( entry.getValue() instanceof Node_Blank ) {
             value = "anonymous element";
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ModelFixer.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/shacl/violation/ModelFixer.java
@@ -42,13 +42,7 @@ private record ModelChange(Model toAdd, Model toRemove) {
       }
    }
 
-   private static class FixVisitor implements Fix.Visitor<ModelChange> {
-      private final Model oldModel;
-
-      FixVisitor( final Model oldModel ) {
-         this.oldModel = oldModel;
-      }
-
+   private record FixVisitor(Model oldModel) implements Fix.Visitor<ModelChange> {
       @Override
       public ModelChange visit( final Fix fix ) {
          return new ModelChange();
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/validation/services/AspectModelValidator.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/validation/services/AspectModelValidator.java
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/validation/services/DetailedViolationFormatter.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/validation/services/DetailedViolationFormatter.java
diff --git a/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/validation/services/ModelCycleDetector.java b/core/esmf-aspect-model-validator/src/main/java/org/eclipse/esmf/aspectmodel/validation/services/ModelCycleDetector.java
diff --git a/core/esmf-aspect-model-validator/src/test/java/org/eclipse/esmf/aspectmodel/shacl/RustLikeFormatterTest.java b/core/esmf-aspect-model-validator/src/test/java/org/eclipse/esmf/aspectmodel/shacl/RustLikeFormatterTest.java
diff --git a/core/esmf-aspect-model-validator/src/test/java/org/eclipse/esmf/aspectmodel/shacl/ShaclValidatorTest.java b/core/esmf-aspect-model-validator/src/test/java/org/eclipse/esmf/aspectmodel/shacl/ShaclValidatorTest.java
diff --git a/core/esmf-aspect-model-validator/src/test/resources/JsConstraintTest.js b/core/esmf-aspect-model-validator/src/test/resources/JsConstraintTest.js
diff --git a/core/esmf-aspect-model-validator/src/test/resources/logback.xml b/core/esmf-aspect-model-validator/src/test/resources/logback.xml

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ record Node(`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
`82`		`- * Implements <code>sh:property</code>`
	`82`	`+ * Implements {@code sh:property}`
`83`	`83`	`*/`
`84`	`84`	`record Property(`
`85`	`85`	`Attributes attributes,`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public <T> T accept( final Visitor<T> visitor ) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/**`
`77`		`- * Perform proper query substitutions; unfortunately the substutions done by {@see org.apache.jena.query.ParameterizedSparqlString} are not always correct.`
	`77`	`+ * Perform proper query substitutions; unfortunately the substitutions done by {@see org.apache.jena.query.ParameterizedSparqlString} are not always correct.`
`78`	`78`	`* @param query the query`
`79`	`79`	`* @param substitutions the map of substitutions to perform`
`80`	`80`	`* @return the updated query`