honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove generics from QueryBuilder. 

Related to elastic/elasticsearchelastic/elasticsearch#18133.

Original commit: elastic/x-pack-elasticsearch@bd8ca4f061
This commit is contained in:
Adrien Grand 2016-05-06 09:06:30 +02:00
parent 22c4fb9a32
commit 5db861d14b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequest.java
View File

@ -278,7 +278,7 @@ public class GraphExploreRequest extends ActionRequest<GraphExploreRequest> impl
* are considered in this stage * are considered in this stage
* @return a {@link Hop} object that holds settings for a stage in the graph exploration * @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; Hop parent = null;
if (hops.size() > 0) { if (hops.size() > 0) {
parent = hops.get(hops.size() - 1); parent = hops.get(hops.size() - 1);

2
elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/GraphExploreRequestBuilder.java
View File

@ -120,7 +120,7 @@ public class GraphExploreRequestBuilder extends ActionRequestBuilder<GraphExplor
* are considered in this stage * are considered in this stage
* @return a {@link Hop} object that holds settings for a stage in the graph exploration * @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); return request.createNextHop(guidingQuery);
} }

6
elasticsearch/x-pack/graph/src/main/java/org/elasticsearch/graph/action/Hop.java
View File

@ -44,7 +44,7 @@ import java.util.List;
public class Hop { public class Hop {
final Hop parentHop; final Hop parentHop;
List<VertexRequest> vertices = null; List<VertexRequest> vertices = null;
QueryBuilder<?> guidingQuery = null; QueryBuilder guidingQuery = null;
Hop(Hop parent) { Hop(Hop parent) {
this.parentHop = parent; this.parentHop = parent;
@ -88,7 +88,7 @@ public class Hop {
} }
} }
public QueryBuilder<?> guidingQuery() { public QueryBuilder guidingQuery() {
if (guidingQuery != null) { if (guidingQuery != null) {
return guidingQuery; return guidingQuery;
} }
@ -117,7 +117,7 @@ public class Hop {
* *
* @param queryBuilder any query * @param queryBuilder any query
*/ */
public void guidingQuery(QueryBuilder<?> queryBuilder) { public void guidingQuery(QueryBuilder queryBuilder) {
guidingQuery = queryBuilder; guidingQuery = queryBuilder;
} }