rename _toQuery() to toQuery() (#760)

* rename _toQuery() to toQuery() Signed-off-by: channel-dante <dante@channel.io> * update CHANGELOG.md Signed-off-by: channel-dante <dante@channel.io> * update CHANGELOG.md Signed-off-by: channel-dante <dante@channel.io> --------- Signed-off-by: channel-dante <dante@channel.io> (cherry picked from commit b50fdb8) Signed-off-by: channel-dante <dante@channel.io>
opensearch-project · Jan 4, 2024 · c3cb5e2 · c3cb5e2
1 parent 339c16c
commit c3cb5e2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added support for flat_object field property ([#735](https://github.com/opensearch-project/opensearch-java/pull/735))
 - Expose HTTP status code through `ResponseException#status` ([#756](https://github.com/opensearch-project/opensearch-java/pull/756))
 - Added toBuilder method to all request model in core package & _types.query_dsl package ([#766](https://github.com/opensearch-project/opensearch-java/pull/766))
+- Added toQuery method in Query and QueryVariant ([#760](https://github.com/opensearch-project/opensearch-java/pull/760)
 
 ### Dependencies
 - Bumps `com.diffplug.spotless` from 6.22.0 to 6.23.3
@@ -15,6 +16,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Changed
 
 ### Deprecated
+- Deprecated "_toQuery()" in Query and QueryVariant ([#760](https://github.com/opensearch-project/opensearch-java/pull/760)
 
 ### Removed
 

diff --git a/...-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java b/...-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java
@@ -39,8 +39,12 @@ public interface QueryVariant {
 
  Query.Kind _queryKind();
 
+ @Deprecated
  default Query _toQuery() {
  return new Query(this);
  }
 
+ default Query toQuery() {
+ return new Query(this);
+ }
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Query.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/Query.java
@@ -50,9 +50,14 @@
 public class Query implements TaggedUnion<Query.Kind, Query.Variant>, JsonpSerializable {
 
  public interface Variant extends UnionVariant<Kind>, JsonpSerializable {
+ @Deprecated
  default Query _toQuery() {
  return new Query(this);
  }
+
+ default Query toQuery() {
+ return new Query(this);
+ }
  }
 
  public enum Kind implements JsonEnum {

diff --git a/...ient/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java b/...ient/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java
@@ -48,7 +48,7 @@ public void testQuery() {
  Query.Variant v = q._get();
  assertEquals(Query.Kind.Bool, v._variantType());
 
- Query q1 = v._toQuery();
+ Query q1 = v.toQuery();
 
  Collection<Query> must = q.bool().must();
 

diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractRequestIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractRequestIT.java
@@ -495,9 +495,9 @@ public void testSubAggregation() throws IOException {
  .filter(
  BoolQuery.of(
  _5 -> _5.filter(
- List.of(TermsQuery.of(_6 -> _6.field("color.keyword").terms(_7 -> _7.value(fieldValues)))._toQuery())
+ List.of(TermsQuery.of(_6 -> _6.field("color.keyword").terms(_7 -> _7.value(fieldValues))).toQuery())
  )
- )._toQuery()
+ ).toQuery()
  )
  )
  );