Correct wrong mapping of types in json meta

Author: Yaytay

query-engine/docs/query-engine-compose.yml

@@ -50,7 +50,7 @@ services:
     - 16686:16686
 
   query-engine:
-    image: ghcr.io/yaytay/query-engine-design-mode:0.0.66-main
+    image: ghcr.io/yaytay/query-engine-design-mode:0.0.67-main
     ports:
     - 2000:8080
     volumes:

query-engine/src/main/java/uk/co/spudsoft/query/exec/fmts/json/FormatJsonInstance.java

@@ -211,7 +211,7 @@ private Future<Void> start() {
             if (cd.type() == DataType.Boolean) {
               typeName = "bool";
             } else if (cd.type() == DataType.Integer || cd.type() == DataType.Long) {
-              typeName = "bool";
+              typeName = "int";
             } else {
               typeName = typeName.toLowerCase(Locale.ROOT);
             }

query-engine/src/main/java/uk/co/spudsoft/query/exec/sources/sql/SourceSqlStreamingInstance.java

@@ -142,9 +142,9 @@ public Future<ReadStreamWithTypes> initialize(PipelineExecutor executor, Pipelin
     if (!JexlEvaluator.isNullOrBlank(endpoint.getCondition())) {
       ConditionInstance cond = endpoint.getCondition().createInstance();
       if (!cond.evaluate(requestContext, null)) {
-        String message = String.format("Endpoint %s (%s) rejected by condition (%s)", definition.getEndpoint(), endpoint.getUrl(), endpoint.getCondition());
-        logger.warn(message);
-        return Future.failedFuture(new ServiceException(503, "Endpoint \"" + definition.getEndpoint() + "\" not accessible", new IllegalStateException(message)));
+        String message = String.format("Endpoint %s (%s) rejected by condition (%s)", endpointName, endpoint.getUrl(), endpoint.getCondition());
+        logger.warn("Endpoint {} ({}) rejected by condition ({})", endpointName, endpoint.getUrl(), endpoint.getCondition());
+        return Future.failedFuture(new ServiceException(503, "Endpoint \"" + endpointName + "\" not accessible", new IllegalStateException(message)));
       }
     }
 

query-engine/src/main/java/uk/co/spudsoft/query/main/Version.java

@@ -34,7 +34,7 @@ public final class Version {
   /**
    * The project version, as set in the Maven pom.xml.
    */
-  public static final String MAVEN_PROJECT_VERSION = "0.0.66-main";
+  public static final String MAVEN_PROJECT_VERSION = "0.0.67-main";
 
   private Version() {
   }

query-engine/src/test/java/uk/co/spudsoft/query/main/FeatureRichQueryIT.java

@@ -140,7 +140,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
 
-    assertThat(body, startsWith("{\"meta\":{\"description\":\"A complex pipeline that tries to demonstrate as many features as I can cram into a single pipeline.\",\"fields\":{\"dataId\":\"bool\",\"instant\":\"datetime\",\"colour\":\"string\",\"value\":\"string\",\"children\":\"string\",\"DateField\":\"date\",\"TimeField\":\"time\",\"DateTimeField\":\"datetime\",\"LongField\":\"bool\",\"DoubleField\":\"double\",\"BoolField\":\"bool\",\"TextField\":\"string\",\"child2\":\"string\",\"child3\":\"string\",\"child5\":\"string\",\"child4\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"colour\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null,\"child2\":\"one\",\"child3\":\"one\",\"child5\":\"one\",\"child4\":\"b0f56ab83929aeda\"},"));
+    assertThat(body, startsWith("{\"meta\":{\"description\":\"A complex pipeline that tries to demonstrate as many features as I can cram into a single pipeline.\",\"fields\":{\"dataId\":\"int\",\"instant\":\"datetime\",\"colour\":\"string\",\"value\":\"string\",\"children\":\"string\",\"DateField\":\"date\",\"TimeField\":\"time\",\"DateTimeField\":\"datetime\",\"LongField\":\"int\",\"DoubleField\":\"double\",\"BoolField\":\"bool\",\"TextField\":\"string\",\"child2\":\"string\",\"child3\":\"string\",\"child5\":\"string\",\"child4\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07T03:00:00Z\",\"colour\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\",\"DateField\":\"2023-05-05\",\"TimeField\":null,\"DateTimeField\":null,\"LongField\":null,\"DoubleField\":null,\"BoolField\":null,\"TextField\":null,\"child2\":\"one\",\"child3\":\"one\",\"child5\":\"one\",\"child4\":\"b0f56ab83929aeda\"},"));
 
     body = given()
             .queryParam("minDate", "2971-05-06")

query-engine/src/test/java/uk/co/spudsoft/query/main/MainQueryIT.java

@@ -210,7 +210,7 @@ public void testQuery() throws Exception {
             .statusCode(200)
             .extract().body().asString();
 
-    assertThat(body, startsWith("{\"meta\":{\"fields\":{\"dataId\":\"bool\",\"ref\":\"string\",\"value\":\"string\",\"children\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07 03:00:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\"},"));
+    assertThat(body, startsWith("{\"meta\":{\"fields\":{\"dataId\":\"int\",\"ref\":\"string\",\"value\":\"string\",\"children\":\"string\"}},\"data\":[{\"dataId\":1,\"instant\":\"1971-05-07 03:00:00\",\"ref\":\"antiquewhite\",\"value\":\"first\",\"children\":\"one\"},"));
     assertThat(body, endsWith(",{\"dataId\":13,\"instant\":\"1971-05-20 15:00:00\",\"ref\":\"cadetblue\",\"value\":\"thirteenth\",\"children\":\"thirteen,twenty six,thirty nine,fifty two,sixty five,seventy eight\"}]}"));
 
     body = given()