From 5db861d14b9eb273ffcf2a3536a08284eec1c316 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Fri, 6 May 2016 09:06:30 +0200
Subject: [PATCH] Remove generics from QueryBuilder.

Related to elastic/elasticsearchelastic/elasticsearch#18133.

Original commit: elastic/x-pack-elasticsearch@bd8ca4f061351705fb572ca6c590157d9e107f85
---
 .../org/elasticsearch/graph/action/GraphExploreRequest.java | 2 +-
 .../graph/action/GraphExploreRequestBuilder.java            | 2 +-
 .../src/main/java/org/elasticsearch/graph/action/Hop.java   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequest.java b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequest.java
index f39bfdda84b..62c02ed360c 100644
--- a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequest.java
+++ b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequest.java
@@ -278,7 +278,7 @@ public class GraphExploreRequest extends ActionRequest<GraphExploreRequest> impl
      * are considered in this stage
      * @return a {@link Hop} object that holds settings for a stage in the graph exploration
      */
-    public Hop createNextHop(QueryBuilder<?> guidingQuery) {
+    public Hop createNextHop(QueryBuilder guidingQuery) {
         Hop parent = null;
         if (hops.size() > 0) {
            parent = hops.get(hops.size() - 1);
diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequestBuilder.java b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequestBuilder.java
index 090ac3c3ab8..dee78a445dc 100644
--- a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequestBuilder.java
+++ b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequestBuilder.java
@@ -120,7 +120,7 @@ public class GraphExploreRequestBuilder extends ActionRequestBuilder<GraphExplor
      * are considered in this stage
      * @return a {@link Hop} object that holds settings for a stage in the graph exploration
      */
-    public Hop createNextHop(@Nullable QueryBuilder<?> guidingQuery) {
+    public Hop createNextHop(@Nullable QueryBuilder guidingQuery) {
         return request.createNextHop(guidingQuery);
     }
 
diff --git a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Hop.java b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Hop.java
index 598d0cfc792..3ae01c472c4 100644
--- a/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Hop.java
+++ b/elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Hop.java
@@ -44,7 +44,7 @@ import java.util.List;
 public class Hop {
     final Hop parentHop;
     List<VertexRequest> vertices = null;
-    QueryBuilder<?> guidingQuery = null;
+    QueryBuilder guidingQuery = null;
 
     Hop(Hop parent) {
         this.parentHop = parent;
@@ -88,7 +88,7 @@ public class Hop {
         }
     }
 
-    public QueryBuilder<?> guidingQuery() {
+    public QueryBuilder guidingQuery() {
         if (guidingQuery != null) {
             return guidingQuery;
         }
@@ -117,7 +117,7 @@ public class Hop {
      *
      * @param queryBuilder any query
      */
-    public void guidingQuery(QueryBuilder<?> queryBuilder) {
+    public void guidingQuery(QueryBuilder queryBuilder) {
         guidingQuery = queryBuilder;
     }