-
Notifications
You must be signed in to change notification settings - Fork 191
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
Add support for wrapper queries #630
Merged
VachaShah
merged 3 commits into
opensearch-project:main
from
andrewparmet:add-wrapper-query
Sep 22, 2023
Merged
Changes from 1 commit
Commits
Show all changes
3 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -169,6 +169,8 @@ public enum Kind implements JsonEnum { | |
|
||
Wildcard("wildcard"), | ||
|
||
Wrapper("wrapper"), | ||
|
||
Type("type"), | ||
|
||
; | ||
|
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
144 changes: 144 additions & 0 deletions
144
...-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/WrapperQuery.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,144 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
/* | ||
* 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. | ||
*/ | ||
|
||
/* | ||
* Modifications Copyright OpenSearch Contributors. See | ||
* GitHub history for details. | ||
*/ | ||
|
||
package org.opensearch.client.opensearch._types.query_dsl; | ||
|
||
import org.opensearch.client.json.JsonpDeserializable; | ||
import org.opensearch.client.json.JsonpDeserializer; | ||
import org.opensearch.client.json.JsonpMapper; | ||
import org.opensearch.client.json.ObjectBuilderDeserializer; | ||
import org.opensearch.client.json.ObjectDeserializer; | ||
import org.opensearch.client.util.ApiTypeHelper; | ||
import org.opensearch.client.util.ObjectBuilder; | ||
import jakarta.json.stream.JsonGenerator; | ||
import java.lang.String; | ||
import java.util.function.Function; | ||
|
||
// typedef: _types.query_dsl.WrapperQuery | ||
|
||
|
||
@JsonpDeserializable | ||
public class WrapperQuery extends QueryBase implements QueryVariant { | ||
private final String query; | ||
|
||
// --------------------------------------------------------------------------------------------- | ||
|
||
private WrapperQuery(Builder builder) { | ||
super(builder); | ||
|
||
this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query"); | ||
|
||
} | ||
|
||
public static WrapperQuery of(Function<Builder, ObjectBuilder<WrapperQuery>> fn) { | ||
return fn.apply(new Builder()).build(); | ||
} | ||
|
||
/** | ||
* Query variant kind. | ||
*/ | ||
@Override | ||
public Query.Kind _queryKind() { | ||
return Query.Kind.Wrapper; | ||
} | ||
|
||
/** | ||
* Required - A base64 encoded query. The binary data format can be any of JSON, | ||
* YAML, CBOR or SMILE encodings | ||
* <p> | ||
* API name: {@code query} | ||
*/ | ||
public final String query() { | ||
return this.query; | ||
} | ||
|
||
protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { | ||
|
||
super.serializeInternal(generator, mapper); | ||
generator.writeKey("query"); | ||
generator.write(this.query); | ||
|
||
} | ||
|
||
// --------------------------------------------------------------------------------------------- | ||
|
||
/** | ||
* Builder for {@link WrapperQuery}. | ||
*/ | ||
|
||
public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<WrapperQuery> { | ||
private String query; | ||
|
||
/** | ||
* Required - A base64 encoded query. The binary data format can be any of JSON, | ||
* YAML, CBOR or SMILE encodings | ||
* <p> | ||
* API name: {@code query} | ||
*/ | ||
public final Builder query(String value) { | ||
this.query = value; | ||
return this; | ||
} | ||
|
||
@Override | ||
protected Builder self() { | ||
return this; | ||
} | ||
|
||
/** | ||
* Builds a {@link WrapperQuery}. | ||
* | ||
* @throws NullPointerException | ||
* if some of the required fields are null. | ||
*/ | ||
public WrapperQuery build() { | ||
_checkSingleUse(); | ||
|
||
return new WrapperQuery(this); | ||
} | ||
} | ||
|
||
// --------------------------------------------------------------------------------------------- | ||
|
||
/** | ||
* Json deserializer for {@link WrapperQuery} | ||
*/ | ||
public static final JsonpDeserializer<WrapperQuery> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new, | ||
WrapperQuery::setupWrapperQueryDeserializer); | ||
|
||
protected static void setupWrapperQueryDeserializer(ObjectDeserializer<WrapperQuery.Builder> op) { | ||
QueryBase.setupQueryBaseDeserializer(op); | ||
op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query"); | ||
|
||
} | ||
|
||
} |
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.
The Elasticsearch header could be dropped, this is a new file, right?
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.
I suppose - I copied it from the other PR which has this header, so it's actually less clear that I can just drop it depending on where the other PR sourced the file.