Skip to content

Commit 7b9ae17

Browse files
authored
Revert "Add EQ|QL version support with its default value (#791)" (#812)
This reverts commit 2333f38.
1 parent 90292f2 commit 7b9ae17

File tree

9 files changed

+11
-228
lines changed

9 files changed

+11
-228
lines changed

java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlHelper.java

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import co.elastic.clients.elasticsearch._types.FieldValue;
2323
import co.elastic.clients.elasticsearch.esql.ElasticsearchEsqlAsyncClient;
2424
import co.elastic.clients.elasticsearch.esql.ElasticsearchEsqlClient;
25-
import co.elastic.clients.elasticsearch.esql.EsqlVersion;
2625
import co.elastic.clients.elasticsearch.esql.QueryRequest;
2726
import co.elastic.clients.json.JsonData;
2827
import co.elastic.clients.transport.endpoints.BinaryResponse;
@@ -37,9 +36,9 @@ public class EsqlHelper {
3736
//----- Synchronous
3837

3938
public static <T> T query(
40-
ElasticsearchEsqlClient client, EsqlVersion version, EsqlAdapter<T> adapter, String query, Object... params
39+
ElasticsearchEsqlClient client, EsqlAdapter<T> adapter, String query, Object... params
4140
) throws IOException {
42-
QueryRequest request = buildRequest(version, adapter, query, params);
41+
QueryRequest request = buildRequest(adapter, query, params);
4342
BinaryResponse response = client.query(request);
4443
return adapter.deserialize(client, request, response);
4544
}
@@ -53,9 +52,9 @@ public static <T> T query(ElasticsearchEsqlClient client, EsqlAdapter<T> adapter
5352
//----- Asynchronous
5453

5554
public static <T> CompletableFuture<T> queryAsync(
56-
ElasticsearchEsqlAsyncClient client, EsqlVersion version, EsqlAdapter<T> adapter, String query, Object... params
55+
ElasticsearchEsqlAsyncClient client, EsqlAdapter<T> adapter, String query, Object... params
5756
) {
58-
return doQueryAsync(client, adapter, buildRequest(version, adapter, query, params));
57+
return doQueryAsync(client, adapter, buildRequest(adapter, query, params));
5958
}
6059

6160
public static <T> CompletableFuture<T> queryAsync(
@@ -80,19 +79,9 @@ private static <T> CompletableFuture<T> doQueryAsync(
8079

8180
//----- Utilities
8281

83-
private static QueryRequest buildRequest(EsqlVersion version, EsqlAdapter<?> adapter, String query, Object... params) {
84-
if (version == null) {
85-
version = EsqlVersion.getDefault();
86-
}
87-
if (version == null) {
88-
throw new IllegalStateException(
89-
"ES|QL default version not set. Either specify it explicitly or set a default value");
90-
}
91-
EsqlVersion v = version;
92-
82+
private static QueryRequest buildRequest(EsqlAdapter<?> adapter, String query, Object... params) {
9383
return QueryRequest.of(esql -> esql
9484
.format(adapter.format())
95-
.version(v)
9685
.columnar(adapter.columnar())
9786
.query(query)
9887
.params(asFieldValues(params))
@@ -110,7 +99,6 @@ private static QueryRequest buildRequest(EsqlAdapter<?> adapter, QueryRequest re
11099
.locale(request.locale())
111100
.params(request.params())
112101
.query(request.query())
113-
.version(request.version())
114102
);
115103
}
116104

java-client/src/main/java/co/elastic/clients/elasticsearch/esql/ElasticsearchEsqlAsyncClient.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,7 @@ public final CompletableFuture<BinaryResponse> query(
111111
* values for query parameters, if any
112112
*/
113113
public final <T> CompletableFuture<T> query(EsqlAdapter<T> adapter, String query, Object... parameters) {
114-
return EsqlHelper.queryAsync(this, null, adapter, query, parameters);
115-
}
116-
117-
/**
118-
* Executes an ES|QL request and adapts its result to a target type.
119-
*
120-
* @param version
121-
* the ES|QL language version
122-
* @param adapter
123-
* the ES|QL response adapter
124-
* @param query
125-
* the ES|QL query
126-
* @param parameters
127-
* values for query parameters, if any
128-
*/
129-
public final <T> CompletableFuture<T> query(EsqlVersion version, EsqlAdapter<T> adapter, String query,
130-
Object... parameters) {
131-
return EsqlHelper.queryAsync(this, version, adapter, query, parameters);
114+
return EsqlHelper.queryAsync(this, adapter, query, parameters);
132115
}
133116

134117
/**

java-client/src/main/java/co/elastic/clients/elasticsearch/esql/ElasticsearchEsqlClient.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,24 +113,7 @@ public final BinaryResponse query(Function<QueryRequest.Builder, ObjectBuilder<Q
113113
*/
114114
public final <T> T query(EsqlAdapter<T> adapter, String query, Object... parameters)
115115
throws IOException, ElasticsearchException {
116-
return EsqlHelper.query(this, null, adapter, query, parameters);
117-
}
118-
119-
/**
120-
* Executes an ES|QL request and adapts its result to a target type.
121-
*
122-
* @param version
123-
* the ES|QL language version
124-
* @param adapter
125-
* the ES|QL response adapter
126-
* @param query
127-
* the ES|QL query
128-
* @param parameters
129-
* values for query parameters, if any
130-
*/
131-
public final <T> T query(EsqlVersion version, EsqlAdapter<T> adapter, String query, Object... parameters)
132-
throws IOException, ElasticsearchException {
133-
return EsqlHelper.query(this, version, adapter, query, parameters);
116+
return EsqlHelper.query(this, adapter, query, parameters);
134117
}
135118

136119
/**

java-client/src/main/java/co/elastic/clients/elasticsearch/esql/EsqlVersion.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

java-client/src/main/java/co/elastic/clients/elasticsearch/esql/QueryRequest.java

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ public class QueryRequest extends RequestBase implements JsonpSerializable {
9090

9191
private final String query;
9292

93-
private final EsqlVersion version;
94-
9593
// ---------------------------------------------------------------------------------------------
9694

9795
private QueryRequest(Builder builder) {
@@ -103,7 +101,6 @@ private QueryRequest(Builder builder) {
103101
this.locale = builder.locale;
104102
this.params = ApiTypeHelper.unmodifiable(builder.params);
105103
this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
106-
this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
107104

108105
}
109106

@@ -185,16 +182,6 @@ public final String query() {
185182
return this.query;
186183
}
187184

188-
/**
189-
* Required - The version of the ES|QL language in which the &quot;query&quot;
190-
* field was written.
191-
* <p>
192-
* API name: {@code version}
193-
*/
194-
public final EsqlVersion version() {
195-
return this.version;
196-
}
197-
198185
/**
199186
* Serialize this object to JSON.
200187
*/
@@ -234,9 +221,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
234221
generator.writeKey("query");
235222
generator.write(this.query);
236223

237-
generator.writeKey("version");
238-
this.version.serialize(generator, mapper);
239-
240224
}
241225

242226
// ---------------------------------------------------------------------------------------------
@@ -266,8 +250,6 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
266250

267251
private String query;
268252

269-
private EsqlVersion version;
270-
271253
/**
272254
* By default, ES|QL returns results as rows. For example, FROM returns each
273255
* individual document as one row. For the JSON, YAML, CBOR and smile formats,
@@ -383,17 +365,6 @@ public final Builder query(String value) {
383365
return this;
384366
}
385367

386-
/**
387-
* Required - The version of the ES|QL language in which the &quot;query&quot;
388-
* field was written.
389-
* <p>
390-
* API name: {@code version}
391-
*/
392-
public final Builder version(EsqlVersion value) {
393-
this.version = value;
394-
return this;
395-
}
396-
397368
@Override
398369
protected Builder self() {
399370
return this;
@@ -410,10 +381,6 @@ public QueryRequest build() {
410381

411382
return new QueryRequest(this);
412383
}
413-
{
414-
// Use the default ES|QL language version if not set explicitly
415-
this.version = EsqlVersion.getDefault();
416-
}
417384
}
418385

419386
// ---------------------------------------------------------------------------------------------
@@ -431,7 +398,6 @@ protected static void setupQueryRequestDeserializer(ObjectDeserializer<QueryRequ
431398
op.add(Builder::locale, JsonpDeserializer.stringDeserializer(), "locale");
432399
op.add(Builder::params, JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER), "params");
433400
op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
434-
op.add(Builder::version, EsqlVersion._DESERIALIZER, "version");
435401

436402
}
437403

java-client/src/test/java/co/elastic/clients/elasticsearch/ElasticsearchTestServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ public synchronized ElasticsearchTestServer start() {
117117
return this;
118118
}
119119

120-
Version version = Version.VERSION.major() < 8 ? new Version(7,17,5,false) : new Version(8,14,0,false);
120+
Version version = Version.VERSION.major() < 8 ? new Version(7,17,5,false) : new Version(8,12,0,false);
121121

122122
// Note we could use version.major() + "." + version.minor() + "-SNAPSHOT" but plugins won't install on a snapshot version
123-
String esImage = "docker.elastic.co/elasticsearch/elasticsearch:" + version + "-SNAPSHOT";
123+
String esImage = "docker.elastic.co/elasticsearch/elasticsearch:" + version;
124124

125125
DockerImageName image;
126126
if (plugins.length == 0) {

java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterEndToEndTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void objectsTest() throws Exception {
134134
{
135135
EmpData emp = it.next();
136136
assertEquals("10042", emp.empNo);
137-
assertEquals(Arrays.asList("Architect", "Business Analyst", "Junior Developer", "Internship"), emp.jobPositions);
137+
assertEquals(Arrays.asList("Architect", "Business Analyst", "Internship", "Junior Developer"), emp.jobPositions);
138138

139139
assertEquals("1993-03-21T00:00:00Z[UTC]",
140140
DateTimeFormatter.ISO_DATE_TIME.format(emp.hireDate.toInstant().atZone(ZoneId.of("UTC")))
@@ -172,7 +172,7 @@ public void asyncObjects() throws Exception {
172172
{
173173
EmpData emp = it.next();
174174
assertEquals("10042", emp.empNo);
175-
assertEquals(Arrays.asList("Architect", "Business Analyst", "Junior Developer", "Internship"), emp.jobPositions);
175+
assertEquals(Arrays.asList("Architect", "Business Analyst", "Internship", "Junior Developer"), emp.jobPositions);
176176

177177
assertEquals("1993-03-21T00:00:00Z[UTC]",
178178
DateTimeFormatter.ISO_DATE_TIME.format(emp.hireDate.toInstant().atZone(ZoneId.of("UTC")))

java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlVersionTest.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

java-client/src/test/java/co/elastic/clients/elasticsearch/spec_issues/SpecIssuesTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ public void i0254_suggesterTest() throws Exception {
164164
}
165165

166166
@Test
167-
@Disabled("Plugins cannot be installed on snapshot versions of ES")
168167
public void i0249_variantKind() throws Exception {
169168
try (ElasticsearchTestServer server = new ElasticsearchTestServer("analysis-icu").start()) {
170169

0 commit comments

Comments
 (0)