-
-
Save bleskes/7ec26991d7be6c816103b8cac65353a4 to your computer and use it in GitHub Desktop.
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
diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java | |
index dc72407..12ac0b5 100644 | |
--- a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java | |
+++ b/core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java | |
@@ -72,7 +72,7 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite | |
* {@link WriteRequest}s to this but java doesn't support syntax to declare that everything in the array has both types so we declare | |
* the one with the least casts. | |
*/ | |
- final List<DocumentRequest<?>> requests = new ArrayList<>(); | |
+ final List<DocumentRequest> requests = new ArrayList<>(); | |
List<Object> payloads = null; | |
protected TimeValue timeout = BulkShardRequest.DEFAULT_TIMEOUT; | |
@@ -87,14 +87,14 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite | |
/** | |
* Adds a list of requests to be executed. Either index or delete requests. | |
*/ | |
- public BulkRequest add(DocumentRequest<?>... requests) { | |
- for (DocumentRequest<?> request : requests) { | |
+ public BulkRequest add(DocumentRequest... requests) { | |
+ for (DocumentRequest request : requests) { | |
add(request, null); | |
} | |
return this; | |
} | |
- public BulkRequest add(DocumentRequest<?> request) { | |
+ public BulkRequest add(DocumentRequest request) { | |
return add(request, null); | |
} | |
@@ -104,7 +104,7 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite | |
* @param payload Optional payload | |
* @return the current bulk request | |
*/ | |
- public BulkRequest add(DocumentRequest<?> request, @Nullable Object payload) { | |
+ public BulkRequest add(DocumentRequest request, @Nullable Object payload) { | |
if (request instanceof IndexRequest) { | |
add((IndexRequest) request, payload); | |
} else if (request instanceof DeleteRequest) { | |
@@ -207,7 +207,7 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite | |
/** | |
* The list of requests in this bulk request. | |
*/ | |
- public List<DocumentRequest<?>> requests() { | |
+ public List<DocumentRequest> requests() { | |
return this.requests; | |
} | |
diff --git a/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java b/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java | |
index 70a117b..6811e4d 100644 | |
--- a/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java | |
+++ b/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java | |
@@ -135,7 +135,7 @@ public final class IngestActionFilter extends AbstractComponent implements Actio | |
return Integer.MAX_VALUE; | |
} | |
- static final class BulkRequestModifier implements Iterator<DocumentRequest<?>> { | |
+ static final class BulkRequestModifier implements Iterator<DocumentRequest> { | |
final BulkRequest bulkRequest; | |
final Set<Integer> failedSlots; | |
diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java b/core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java | |
index 57eb7af..342f8e2 100644 | |
--- a/core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java | |
+++ b/core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java | |
@@ -68,7 +68,7 @@ public class PipelineExecutionService implements ClusterStateListener { | |
}); | |
} | |
- public void executeBulkRequest(Iterable<DocumentRequest<?>> actionRequests, | |
+ public void executeBulkRequest(Iterable<DocumentRequest> actionRequests, | |
BiConsumer<IndexRequest, Exception> itemFailureHandler, | |
Consumer<Exception> completionHandler) { | |
threadPool.executor(ThreadPool.Names.BULK).execute(new AbstractRunnable() { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment