-
Notifications
You must be signed in to change notification settings - Fork 182
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.
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
Bulk UpdateOperation misses upsert options #353
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
158 changes: 158 additions & 0 deletions
158
...-client/src/main/java/org/opensearch/client/opensearch/core/bulk/UpdateOperationData.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,158 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.client.opensearch.core.bulk; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import org.opensearch.client.json.JsonpMapper; | ||
| import org.opensearch.client.json.JsonpSerializable; | ||
| import org.opensearch.client.json.JsonpSerializer; | ||
| import org.opensearch.client.json.JsonpUtils; | ||
| import org.opensearch.client.opensearch._types.Script; | ||
| import org.opensearch.client.util.ObjectBuilder; | ||
|
|
||
| import jakarta.json.stream.JsonGenerator; | ||
|
|
||
| public class UpdateOperationData<TDocument> implements JsonpSerializable { | ||
| @Nullable | ||
| private final TDocument document; | ||
|
|
||
| @Nullable | ||
| private final Boolean docAsUpsert; | ||
|
|
||
| @Nullable | ||
| private final TDocument upsert; | ||
|
|
||
| @Nullable | ||
| private final Script script; | ||
|
|
||
| @Nullable | ||
| private final JsonpSerializer<TDocument> tDocumentSerializer; | ||
|
|
||
| private UpdateOperationData(Builder<TDocument> builder) { | ||
| this.document = builder.document; | ||
| this.docAsUpsert = builder.docAsUpsert; | ||
| this.script = builder.script; | ||
| this.upsert = builder.upsert; | ||
| this.tDocumentSerializer = builder.tDocumentSerializer; | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void serialize(JsonGenerator generator, JsonpMapper mapper) { | ||
| generator.writeStartObject(); | ||
| serializeInternal(generator, mapper); | ||
| generator.writeEnd(); | ||
| } | ||
|
|
||
| protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { | ||
| if (this.docAsUpsert != null) { | ||
| generator.writeKey("doc_as_upsert"); | ||
| generator.write(this.docAsUpsert); | ||
| } | ||
|
|
||
| if (this.document != null) { | ||
| generator.writeKey("doc"); | ||
| JsonpUtils.serialize(document, generator, tDocumentSerializer, mapper); | ||
| } | ||
|
|
||
| if (this.upsert != null) { | ||
| generator.writeKey("upsert"); | ||
| JsonpUtils.serialize(upsert, generator, tDocumentSerializer, mapper); | ||
| } | ||
|
|
||
| if (this.script != null) { | ||
| generator.writeKey("script"); | ||
| this.script.serialize(generator, mapper); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Builder for {@link UpdateOperationData}. | ||
| */ | ||
| public static class Builder<TDocument> extends BulkOperationBase.AbstractBuilder<Builder<TDocument>> | ||
| implements | ||
| ObjectBuilder<UpdateOperationData<TDocument>> { | ||
|
|
||
| @Nullable | ||
| private TDocument document; | ||
|
|
||
| @Nullable | ||
| private JsonpSerializer<TDocument> tDocumentSerializer; | ||
|
|
||
| @Nullable | ||
| private Boolean docAsUpsert; | ||
|
|
||
| @Nullable | ||
| private TDocument upsert; | ||
|
|
||
|
|
||
| @Nullable | ||
| private Script script; | ||
|
|
||
| /** | ||
| * API name: {@code document} | ||
| */ | ||
| public final Builder<TDocument> document(TDocument value) { | ||
| this.document = value; | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * API name: {@code docAsUpsert} | ||
| */ | ||
| public final Builder<TDocument> docAsUpsert(@Nullable Boolean value) { | ||
| this.docAsUpsert = value; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * API name: {@code upsert} | ||
| */ | ||
| public final Builder<TDocument> upsert(@Nullable TDocument value) { | ||
| this.upsert = value; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * API name: {@code script} | ||
| */ | ||
| public final Builder<TDocument> script(@Nullable Script value) { | ||
| this.script = value; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Serializer for TDocument. If not set, an attempt will be made to find a | ||
| * serializer from the JSON context. | ||
| */ | ||
| public final Builder<TDocument> tDocumentSerializer(@Nullable JsonpSerializer<TDocument> value) { | ||
| this.tDocumentSerializer = value; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| protected Builder<TDocument> self() { | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Builds a {@link UpdateOperationData}. | ||
| * | ||
| * @throws NullPointerException | ||
| * if some of the required fields are null. | ||
| */ | ||
| public UpdateOperationData<TDocument> build() { | ||
| _checkSingleUse(); | ||
|
|
||
| return new UpdateOperationData<TDocument>(this); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't document be required as non null?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, the document or script could be specified, so it is nullable indeed