Unify query builders

traveltime-dev · Aug 29, 2024 · 0aff981 · 0aff981
1 parent ce5fbe0
commit 0aff981
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 5 deletions.
diff --git a/7.10/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.10/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -93,7 +93,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("country", country == null ? null : country.getValue());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
-      builder.field("distance_output", distanceOutput);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/7.11/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.11/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -93,7 +93,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("country", country == null ? null : country.getValue());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
-      builder.field("distance_output", distanceOutput);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/7.12/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.12/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/7.13/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.13/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/7.14/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.14/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/7.15/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.15/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/7.16/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.16/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/7.17/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/7.17/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.0/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.0/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.1/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.1/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -53,6 +53,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -65,6 +66,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -77,6 +79,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.10/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.10/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -81,7 +81,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
-      builder.field("distance_output", distanceOutput);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.12/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.12/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -82,7 +82,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
-      builder.field("distance_output", distanceOutput);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.13/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.13/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -82,7 +82,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
-      builder.field("distance_output", distanceOutput);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.2/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.2/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -54,6 +54,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -66,6 +67,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -78,6 +80,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.3/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.3/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -54,6 +54,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -66,6 +67,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -78,6 +80,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.4/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.4/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -54,6 +54,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -66,6 +67,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -78,6 +80,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.5/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.5/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -54,6 +54,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -66,6 +67,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -78,6 +80,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.6/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.6/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -55,6 +55,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -67,6 +68,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -79,6 +81,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override

diff --git a/8.7/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java b/8.7/src/main/java/com/traveltime/plugin/elasticsearch/query/TraveltimeQueryBuilder.java
@@ -55,6 +55,7 @@ public TraveltimeQueryBuilder(StreamInput in) throws IOException {
       requestType = in.readOptionalEnum(RequestType.class);
       prefilter = in.readOptionalNamedWriteable(QueryBuilder.class);
       output = in.readString();
+      distanceOutput = in.readString();
    }
 
    @Override
@@ -67,6 +68,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
       out.writeOptionalEnum(requestType);
       out.writeOptionalNamedWriteable(prefilter);
       out.writeString(output);
+      out.writeString(distanceOutput);
    }
 
    @Override
@@ -79,6 +81,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
       builder.field("requestType", requestType == null ? null : requestType.name());
       builder.field("prefilter", prefilter);
       builder.field("output", output);
+      builder.field("distanceOutput", distanceOutput);
    }
 
    @Override