Skip to content

[Backport 9.3] Add boolean enum Subobjects #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l-trotta merged 1 commit into from
Jan 27, 2026
+79 −1
Merged

[Backport 9.3] Add boolean enum Subobjects #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/Subobjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import co.elastic.clients.json.JsonEnum;
import co.elastic.clients.json.JsonpDeserializable;
import co.elastic.clients.json.JsonpDeserializer;
import co.elastic.clients.json.JsonpMapper;
import jakarta.json.stream.JsonGenerator;

//----------------------------------------------------------------
// THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
Expand Down Expand Up @@ -63,6 +65,17 @@ public String jsonValue() {
return this.jsonValue;
}

public static final JsonEnum.Deserializer<Subobjects> _DESERIALIZER = new JsonEnum.Deserializer<>(
@Override
public void serialize(JsonGenerator generator, JsonpMapper params) {
if (this == Subobjects.True) {
generator.write(true);
} else if (this == Subobjects.False) {
generator.write(false);
} else {
generator.write(jsonValue());
}
}

public static final JsonEnum.Deserializer<Subobjects> _DESERIALIZER = new JsonEnum.Deserializer.AllowingBooleans<>(
Subobjects.values());
}
65 changes: 65 additions & 0 deletions java-client/src/test/java/co/elastic/clients/json/WithJsonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import co.elastic.clients.elasticsearch._types.mapping.TextProperty;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.TermQuery;
import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateResponse;
import co.elastic.clients.elasticsearch.core.IndexRequest;
import co.elastic.clients.elasticsearch.core.SearchResponse;
import co.elastic.clients.elasticsearch.indices.PutIndicesSettingsRequest;
Expand Down Expand Up @@ -185,5 +186,69 @@ public void testExternalTaggedUnion() {
.withJson(new StringReader("{\"id\": \"foo\"}")));
assertTrue(!withStoredScript.id().isEmpty());
}

@Test
public void testBooleanEnum() {

String templateJsonBooleanSubobject = """
{
"component_templates": [
{
"name": "test-template",
"component_template": {
"template": {
"mappings": {
"properties": {
"document": {
"subobjects": false,
"properties": {
"body.size": {
"type": "integer"
}
}
}
}
}
}
}
}
]
}
""";

String templateJsonStringSubobject = """
{
"component_templates": [
{
"name": "test-template",
"component_template": {
"template": {
"mappings": {
"properties": {
"document": {
"subobjects": "false",
"properties": {
"body.size": {
"type": "integer"
}
}
}
}
}
}
}
}
]
}
""";

GetComponentTemplateResponse respBool = GetComponentTemplateResponse.of(t -> t
.withJson(new StringReader(templateJsonBooleanSubobject)));
GetComponentTemplateResponse respString = GetComponentTemplateResponse.of(t -> t
.withJson(new StringReader(templateJsonStringSubobject)));

// Asserting that both gets deserialized in the same way
assertEquals(respBool.toString(), respString.toString());
}
}