JSON Schema support, Parameters in CQL2-JSON (#411)

Co-authored-by: Andreas Zahnen <[email protected]>

Author: cportele

xtraplatform-cql/build.gradle

@@ -10,6 +10,7 @@ descriptionDe = 'CQL2 Ausdrücke.'
 dependencies {
     provided project(":xtraplatform-crs")
     provided project(":xtraplatform-geometries")
+    provided project(":xtraplatform-jsonschema")
 
     antlr libs.antlr
 

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlCoordinateChecker.java

@@ -10,6 +10,7 @@
 import com.google.common.collect.ImmutableList;
 import de.ii.xtraplatform.cql.domain.Bbox;
 import de.ii.xtraplatform.cql.domain.CqlNode;
+import de.ii.xtraplatform.cql.domain.CqlVisitorBase;
 import de.ii.xtraplatform.cql.domain.GeometryNode;
 import de.ii.xtraplatform.cql.domain.PositionNode;
 import de.ii.xtraplatform.cql.domain.SpatialLiteral;

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlImpl.java

@@ -16,12 +16,11 @@
 import com.fasterxml.jackson.databind.util.StdConverter;
 import com.github.azahnen.dagger.annotations.AutoBind;
 import com.google.common.collect.ImmutableList;
-import de.ii.xtraplatform.cql.domain.BooleanValue2;
 import de.ii.xtraplatform.cql.domain.Cql;
 import de.ii.xtraplatform.cql.domain.Cql2Expression;
 import de.ii.xtraplatform.cql.domain.CqlParseException;
 import de.ii.xtraplatform.cql.domain.CqlToText;
-import de.ii.xtraplatform.cql.domain.Operation;
+import de.ii.xtraplatform.cql.domain.CqlVisitorExtractParameters;
 import de.ii.xtraplatform.cql.domain.TemporalFunction;
 import de.ii.xtraplatform.cql.domain.TemporalLiteral;
 import de.ii.xtraplatform.cql.infra.CqlTextParser;
@@ -80,16 +79,19 @@ public Cql2Expression read(String cql, Format format, EpsgCrs crs) throws CqlPar
       case TEXT:
         return cqlTextParser.parse(cql, crs);
       case JSON:
-        // handle boolean value
-        if (cql.trim().equalsIgnoreCase("true")) {
-          return BooleanValue2.of(true);
-        } else if (cql.trim().equalsIgnoreCase("false")) {
-          return BooleanValue2.of(false);
-        }
         cqlJsonMapper.setInjectableValues(
             new InjectableValues.Std().addValue("filterCrs", Optional.ofNullable(crs)));
         try {
-          return cqlJsonMapper.readValue(cql, Operation.class);
+          Cql2Expression expression = cqlJsonMapper.readValue(cql, Cql2Expression.class);
+
+          // parameters are a CQL2-JSON extension used in stored queries; they must not appear in
+          // normal CQL2 expressions
+          if (!expression.accept(new CqlVisitorExtractParameters(Map.of()), true).isEmpty()) {
+            throw new CqlParseException(
+                "Parameters are not allowed in CQL2 filter expressions, except in stored queries.");
+          }
+
+          return expression;
         } catch (IOException e) {
           throw new CqlParseException(e.getMessage());
         }

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlPropertyChecker.java

@@ -12,6 +12,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import de.ii.xtraplatform.cql.domain.CqlNode;
+import de.ii.xtraplatform.cql.domain.CqlVisitorBase;
 import de.ii.xtraplatform.cql.domain.Property;
 import java.util.ArrayList;
 import java.util.Collection;

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlTypeAndFunctionChecker.java

@@ -22,6 +22,7 @@
 import de.ii.xtraplatform.cql.domain.Cql;
 import de.ii.xtraplatform.cql.domain.Cql2Expression;
 import de.ii.xtraplatform.cql.domain.CqlNode;
+import de.ii.xtraplatform.cql.domain.CqlVisitorBase;
 import de.ii.xtraplatform.cql.domain.Eq;
 import de.ii.xtraplatform.cql.domain.Function;
 import de.ii.xtraplatform.cql.domain.ImmutableBetween;

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlVisitorMapEnvelopes.java

@@ -9,6 +9,7 @@
 
 import de.ii.xtraplatform.cql.domain.Bbox;
 import de.ii.xtraplatform.cql.domain.CqlNode;
+import de.ii.xtraplatform.cql.domain.CqlVisitorCopy;
 import de.ii.xtraplatform.cql.domain.GeometryNode;
 import de.ii.xtraplatform.cql.domain.SpatialLiteral;
 import de.ii.xtraplatform.crs.domain.CrsInfo;

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlVisitorMapNots.java

@@ -10,6 +10,7 @@
 import de.ii.xtraplatform.cql.domain.And;
 import de.ii.xtraplatform.cql.domain.Cql2Expression;
 import de.ii.xtraplatform.cql.domain.CqlNode;
+import de.ii.xtraplatform.cql.domain.CqlVisitorCopy;
 import de.ii.xtraplatform.cql.domain.Eq;
 import de.ii.xtraplatform.cql.domain.Gt;
 import de.ii.xtraplatform.cql.domain.Gte;

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlVisitorMapTemporalOperators.java

@@ -11,6 +11,7 @@
 import de.ii.xtraplatform.cql.domain.And;
 import de.ii.xtraplatform.cql.domain.BinaryTemporalOperation;
 import de.ii.xtraplatform.cql.domain.CqlNode;
+import de.ii.xtraplatform.cql.domain.CqlVisitorCopy;
 import de.ii.xtraplatform.cql.domain.Eq;
 import de.ii.xtraplatform.cql.domain.Function;
 import de.ii.xtraplatform.cql.domain.Gt;

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/app/CqlVisitorPropertyPrefix.java

@@ -8,6 +8,7 @@
 package de.ii.xtraplatform.cql.app;
 
 import de.ii.xtraplatform.cql.domain.CqlNode;
+import de.ii.xtraplatform.cql.domain.CqlVisitorCopy;
 import de.ii.xtraplatform.cql.domain.Property;
 import java.util.List;
 

xtraplatform-cql/src/main/java/de/ii/xtraplatform/cql/domain/Cql2Expression.java

@@ -7,8 +7,45 @@
  */
 package de.ii.xtraplatform.cql.domain;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import java.io.IOException;
+
+@JsonDeserialize(using = Cql2Expression.Cql2JsonDeserializer.class)
 public interface Cql2Expression extends Operand, CqlNode {
 
+  class Cql2JsonDeserializer extends StdDeserializer<Cql2Expression> {
+
+    protected Cql2JsonDeserializer() {
+      this(null);
+    }
+
+    protected Cql2JsonDeserializer(Class<?> vc) {
+      super(vc);
+    }
+
+    @Override
+    public Cql2Expression deserialize(JsonParser parser, DeserializationContext ctxt)
+        throws IOException, JsonMappingException {
+
+      JsonNode node = parser.getCodec().readTree(parser);
+
+      if (node.isBoolean()) {
+        return BooleanValue2.of(node.asBoolean());
+      }
+
+      try {
+        return parser.getCodec().treeToValue(node, Operation.class);
+      } catch (IOException e) {
+        throw new CqlParseException(e.getMessage());
+      }
+    }
+  }
+
   default <T> T accept(CqlVisitor<T> visitor, boolean isRoot) {
     T visited = accept(visitor);
     return isRoot ? visitor.postProcess(this, visited) : visited;