From 3f59a4aab0490c2b01faad504c1298a06019fedb Mon Sep 17 00:00:00 2001
From: channel-dante <dante@channel.io>
Date: Thu, 7 Dec 2023 14:09:29 +0900
Subject: [PATCH] rename _toQuery() to toQuery()

---
 .../client/opensearch/_types/query_dsl/QueryVariant.java     | 4 ++++
 .../client/opensearch/experiments/api/query2/Query.java      | 5 +++++
 .../client/opensearch/experiments/api/query2/QueryTest.java  | 2 +-
 .../client/opensearch/integTest/AbstractRequestIT.java       | 4 ++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java
index 16db07a1ab..8ec793bd21 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryVariant.java
+++ b/java-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
index 617d6668a0..74d2b2ab25 100644
--- 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/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java
index 6405ad3d44..5cd3d1d564 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/api/query2/QueryTest.java
+++ b/java-client/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
index 716cc4b25d..5179443cc4 100644
--- 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()
                         )
                 )
         );