Remove access to core methods in SparqlHttpClient

Author: anquetil

src/main/java/fr/inria/corese/command/utils/http/SparqlHttpClient.java

@@ -11,10 +11,6 @@
 import fr.inria.corese.command.VersionProvider;
 import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseSparqlQuery;
 import fr.inria.corese.core.sparql.exceptions.EngineException;
-import fr.inria.corese.core.sparql.triple.parser.Constant;
-import fr.inria.corese.core.sparql.triple.update.ASTUpdate;
-import fr.inria.corese.core.sparql.triple.update.Composite;
-import fr.inria.corese.core.sparql.triple.update.Update;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.client.Entity;
@@ -189,19 +185,15 @@ public String sendRequest(String query, List<String> defaultGraphUris, List<Stri
      * @param defaultGraphUris default graph URIs to use
      * @param namedGraphUris   named graph URIs to use
      */
-    private void validateQuery(String queryString, List<String> defaultGraphUris, List<String> namedGraphUris) {
+    protected void validateQuery(String queryString, List<String> defaultGraphUris, List<String> namedGraphUris) {
 
         // Check if the query is defined
         if (queryString == null || queryString.isEmpty()) {
             throw new IllegalArgumentException("SPARQL query must be specified");
         }
 
-        // Check if the query is a valid SPARQL query
-        if (! CoreseSparqlQuery.isValidSparqlQuery(queryString)) {
-            throw new IllegalArgumentException("Invalid SPARQL query");
-        }
-
         // Try to build a SPARQL query from the queryString
+        // (Check if the query is a valid SPARQL query)
         CoreseSparqlQuery query = null;
         try {
             query = new CoreseSparqlQuery(queryString);
@@ -231,7 +223,7 @@ private void validateQuery(String queryString, List<String> defaultGraphUris, Li
         // Check if the query contains FROM clause and default/named graph URIs
         // which is not allowed by the SPARQL specification
         // (see https://www.w3.org/TR/sparql11-protocol/#query-operation)
-        if (query.containsFromClause() && !(defaultGraphUris.isEmpty() && namedGraphUris.isEmpty())) {
+        if (query.containsFromClause() && (!defaultGraphUris.isEmpty() || !namedGraphUris.isEmpty())) {
             throw new IllegalArgumentException(
                     "SPARQL query contains FROM clause, but default and named graph URIs are specified. It is not allowed to specify both FROM clause and default/named graph URIs. Please remove FROM clause from the query or remove default/named graph URIs.");
         }
@@ -240,23 +232,11 @@ private void validateQuery(String queryString, List<String> defaultGraphUris, Li
         // and the using-graph-uri/using-named-graph-uri parameters are also specified
         // which is not allowed by the SPARQL specification
         // (see https://www.w3.org/TR/sparql11-protocol/#update-operation)
-        List<String> sparqlConstants = new ArrayList<>();
-        ASTUpdate astUpdate = query.getAstUpdate();
-        if (astUpdate != null) {
-            for (Update update : astUpdate.getUpdates()) {
-                Composite composite = update.getComposite();
-                if (composite != null) {
-                    Constant with = composite.getWith();
-                    if (with != null) {
-                        sparqlConstants.add(with.getLabel());
-                    }
-                }
-            }
-        }
-
-        if (!sparqlConstants.isEmpty() && (!defaultGraphUris.isEmpty() || !namedGraphUris.isEmpty())) {
+        if (query.containsWithClause() && (!defaultGraphUris.isEmpty() || !namedGraphUris.isEmpty())) {
             throw new IllegalArgumentException(
-                    "SPARQL update query contains USING, USING NAMED, or WITH clause and the using-graph-uri/using-named-graph-uri parameters are also specified. It is not allowed to specify both USING, USING NAMED, or WITH clause and the using-graph-uri/using-named-graph-uri parameters. Please remove USING, USING NAMED, or WITH clause from the query or remove the using-graph-uri/using-named-graph-uri parameters.");
+                "SPARQL update query contains USING, USING NAMED, or WITH clause and the using-graph-uri/using-named-graph-uri parameters are also specified."
+                + " It is not allowed to specify both USING, USING NAMED, or WITH clause and the using-graph-uri/using-named-graph-uri parameters."
+                + "Please remove USING, USING NAMED, or WITH clause from the query or remove the using-graph-uri/using-named-graph-uri parameters.");
         }
 
     }