-
Notifications
You must be signed in to change notification settings - Fork 246
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add EQ|QL version support with its default value (#791)
- Loading branch information
Showing
9 changed files
with
228 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
java-client/src/main/java/co/elastic/clients/elasticsearch/esql/EsqlVersion.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package co.elastic.clients.elasticsearch.esql; | ||
|
|
||
| import co.elastic.clients.json.JsonEnum; | ||
| import co.elastic.clients.json.JsonpDeserializable; | ||
| import co.elastic.clients.json.JsonpDeserializer; | ||
|
|
||
| //---------------------------------------------------------------- | ||
| // THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST. | ||
| //---------------------------------------------------------------- | ||
| // | ||
| // This code is generated from the Elasticsearch API specification | ||
| // at https://github.com/elastic/elasticsearch-specification | ||
| // | ||
| // Manual updates to this file will be lost when the code is | ||
| // re-generated. | ||
| // | ||
| // If you find a property that is missing or wrongly typed, please | ||
| // open an issue or a PR on the API specification repository. | ||
| // | ||
| //---------------------------------------------------------------- | ||
|
|
||
| /** | ||
| * | ||
| * @see <a href="../doc-files/api-spec.html#esql._types.EsqlVersion">API | ||
| * specification</a> | ||
| */ | ||
| @JsonpDeserializable | ||
| public enum EsqlVersion implements JsonEnum { | ||
| /** | ||
| * Run against the first version of ES|QL. | ||
| */ | ||
| V2024_04_01("2024.04.01"), | ||
|
|
||
| ; | ||
|
|
||
| private final String jsonValue; | ||
|
|
||
| EsqlVersion(String jsonValue) { | ||
| this.jsonValue = jsonValue; | ||
| } | ||
|
|
||
| public String jsonValue() { | ||
| return this.jsonValue; | ||
| } | ||
|
|
||
| private static EsqlVersion DEFAULT_VERSION = V2024_04_01; | ||
|
|
||
| /** | ||
| * The default ES|QL language version used when not explicitly specified. | ||
| */ | ||
| public static EsqlVersion getDefault() { | ||
| return DEFAULT_VERSION; | ||
| } | ||
|
|
||
| /** | ||
| * Set the default ES|QL language version to be used. This is a global | ||
| * application-wide setting. | ||
| */ | ||
| public static void setDefault(EsqlVersion version) { | ||
| DEFAULT_VERSION = version; | ||
| } | ||
|
|
||
| public static final JsonEnum.Deserializer<EsqlVersion> _DESERIALIZER = new JsonEnum.Deserializer<>( | ||
| EsqlVersion.values()); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlVersionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package co.elastic.clients.elasticsearch._helpers.esql; | ||
|
|
||
| import co.elastic.clients.elasticsearch.esql.EsqlVersion; | ||
| import co.elastic.clients.elasticsearch.esql.QueryRequest; | ||
| import co.elastic.clients.util.MissingRequiredPropertyException; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class EsqlVersionTest extends Assertions { | ||
|
|
||
| @Test | ||
| public void testDefaultVersion() { | ||
|
|
||
| // If version is missing, the default one is used. | ||
| QueryRequest r = QueryRequest.of(q -> q | ||
| .query("foo") | ||
| ); | ||
|
|
||
| assertEquals(EsqlVersion.getDefault(), r.version()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSetVersionToNull() { | ||
|
|
||
| assertThrows(MissingRequiredPropertyException.class, () -> { | ||
| // If version is explicitly set to null, the default isn't used | ||
| QueryRequest r = QueryRequest.of(q -> q | ||
| .version(null) | ||
| .query("foo") | ||
| ); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters