Skip to content

Commit 2a14945

Browse files
author
Christoph Büscher
committed
Reduce number of raw types warnings
Among the ~7000 warnings we currently have, raw type warnings are one of the biggest group (aprox. 1700) and one that is the easiest to reduce. This PR is a fist attempt to reduce this number, most of the time by using the unbounded wildcard.
1 parent f04c579 commit 2a14945

File tree

67 files changed

+261
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+261
-248
lines changed

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/NoopSearchRequestBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public NoopSearchRequestBuilder addSort(String field, SortOrder order) {
329329
*
330330
* @see org.elasticsearch.search.sort.SortBuilders
331331
*/
332-
public NoopSearchRequestBuilder addSort(SortBuilder sort) {
332+
public NoopSearchRequestBuilder addSort(SortBuilder<?> sort) {
333333
sourceBuilder().sort(sort);
334334
return this;
335335
}
@@ -415,7 +415,7 @@ public NoopSearchRequestBuilder setRescorer(RescorerBuilder<?> rescorer) {
415415
* @param window rescore window
416416
* @return this for chaining
417417
*/
418-
public NoopSearchRequestBuilder setRescorer(RescorerBuilder rescorer, int window) {
418+
public NoopSearchRequestBuilder setRescorer(RescorerBuilder<?> rescorer, int window) {
419419
sourceBuilder().clearRescorers();
420420
return addRescorer(rescorer.windowSize(window));
421421
}

‎modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/AppendProcessorTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void testAppendValuesToNonExistingList() throws Exception {
9191
appendProcessor = createAppendProcessor(field, values);
9292
}
9393
appendProcessor.execute(ingestDocument);
94-
List list = ingestDocument.getFieldValue(field, List.class);
94+
List<?> list = ingestDocument.getFieldValue(field, List.class);
9595
assertThat(list, not(sameInstance(values)));
9696
assertThat(list, equalTo(values));
9797
}
@@ -115,7 +115,7 @@ public void testConvertScalarToList() throws Exception {
115115
appendProcessor = createAppendProcessor(field, values);
116116
}
117117
appendProcessor.execute(ingestDocument);
118-
List fieldValue = ingestDocument.getFieldValue(field, List.class);
118+
List<?> fieldValue = ingestDocument.getFieldValue(field, List.class);
119119
assertThat(fieldValue.size(), equalTo(values.size() + 1));
120120
assertThat(fieldValue.get(0), equalTo(initialValue));
121121
for (int i = 1; i < values.size() + 1; i++) {
@@ -144,7 +144,7 @@ public void testAppendMetadataExceptVersion() throws Exception {
144144
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
145145
Object initialValue = ingestDocument.getSourceAndMetadata().get(randomMetaData.getFieldName());
146146
appendProcessor.execute(ingestDocument);
147-
List list = ingestDocument.getFieldValue(randomMetaData.getFieldName(), List.class);
147+
List<?> list = ingestDocument.getFieldValue(randomMetaData.getFieldName(), List.class);
148148
if (initialValue == null) {
149149
assertThat(list, equalTo(values));
150150
} else {

‎server/src/main/java/org/elasticsearch/action/Action.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public TransportRequestOptions transportOptions(Settings settings) {
5757

5858
@Override
5959
public boolean equals(Object o) {
60-
return o instanceof Action && name.equals(((Action) o).name());
60+
return o instanceof Action && name.equals(((Action<?>) o).name());
6161
}
6262

6363
@Override

‎server/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
public class BulkItemRequest implements Streamable {
3232

3333
private int id;
34-
private DocWriteRequest request;
34+
private DocWriteRequest<?> request;
3535
private volatile BulkItemResponse primaryResponse;
3636

3737
BulkItemRequest() {
3838

3939
}
4040

4141
// NOTE: public for testing only
42-
public BulkItemRequest(int id, DocWriteRequest request) {
42+
public BulkItemRequest(int id, DocWriteRequest<?> request) {
4343
this.id = id;
4444
this.request = request;
4545
}
@@ -48,7 +48,7 @@ public int id() {
4848
return id;
4949
}
5050

51-
public DocWriteRequest request() {
51+
public DocWriteRequest<?> request() {
5252
return request;
5353
}
5454

‎server/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -248,24 +248,24 @@ public synchronized boolean awaitClose(long timeout, TimeUnit unit) throws Inter
248248
* (for example, if no id is provided, one will be generated, or usage of the create flag).
249249
*/
250250
public BulkProcessor add(IndexRequest request) {
251-
return add((DocWriteRequest) request);
251+
return add((DocWriteRequest<?>) request);
252252
}
253253

254254
/**
255255
* Adds an {@link DeleteRequest} to the list of actions to execute.
256256
*/
257257
public BulkProcessor add(DeleteRequest request) {
258-
return add((DocWriteRequest) request);
258+
return add((DocWriteRequest<?>) request);
259259
}
260260

261261
/**
262262
* Adds either a delete or an index request.
263263
*/
264-
public BulkProcessor add(DocWriteRequest request) {
264+
public BulkProcessor add(DocWriteRequest<?> request) {
265265
return add(request, null);
266266
}
267267

268-
public BulkProcessor add(DocWriteRequest request, @Nullable Object payload) {
268+
public BulkProcessor add(DocWriteRequest<?> request, @Nullable Object payload) {
269269
internalAdd(request, payload);
270270
return this;
271271
}
@@ -280,7 +280,7 @@ protected void ensureOpen() {
280280
}
281281
}
282282

283-
private synchronized void internalAdd(DocWriteRequest request, @Nullable Object payload) {
283+
private synchronized void internalAdd(DocWriteRequest<?> request, @Nullable Object payload) {
284284
ensureOpen();
285285
bulkRequest.add(request, payload);
286286
executeIfNeeded();

‎server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class BulkRequest extends ActionRequest implements CompositeIndicesReques
8383
* {@link WriteRequest}s to this but java doesn't support syntax to declare that everything in the array has both types so we declare
8484
* the one with the least casts.
8585
*/
86-
final List<DocWriteRequest> requests = new ArrayList<>();
86+
final List<DocWriteRequest<?>> requests = new ArrayList<>();
8787
private final Set<String> indices = new HashSet<>();
8888
List<Object> payloads = null;
8989

@@ -99,14 +99,14 @@ public BulkRequest() {
9999
/**
100100
* Adds a list of requests to be executed. Either index or delete requests.
101101
*/
102-
public BulkRequest add(DocWriteRequest... requests) {
103-
for (DocWriteRequest request : requests) {
102+
public BulkRequest add(DocWriteRequest<?>... requests) {
103+
for (DocWriteRequest<?> request : requests) {
104104
add(request, null);
105105
}
106106
return this;
107107
}
108108

109-
public BulkRequest add(DocWriteRequest request) {
109+
public BulkRequest add(DocWriteRequest<?> request) {
110110
return add(request, null);
111111
}
112112

@@ -116,7 +116,7 @@ public BulkRequest add(DocWriteRequest request) {
116116
* @param payload Optional payload
117117
* @return the current bulk request
118118
*/
119-
public BulkRequest add(DocWriteRequest request, @Nullable Object payload) {
119+
public BulkRequest add(DocWriteRequest<?> request, @Nullable Object payload) {
120120
if (request instanceof IndexRequest) {
121121
add((IndexRequest) request, payload);
122122
} else if (request instanceof DeleteRequest) {
@@ -133,8 +133,8 @@ public BulkRequest add(DocWriteRequest request, @Nullable Object payload) {
133133
/**
134134
* Adds a list of requests to be executed. Either index or delete requests.
135135
*/
136-
public BulkRequest add(Iterable<DocWriteRequest> requests) {
137-
for (DocWriteRequest request : requests) {
136+
public BulkRequest add(Iterable<DocWriteRequest<?>> requests) {
137+
for (DocWriteRequest<?> request : requests) {
138138
add(request);
139139
}
140140
return this;
@@ -223,7 +223,7 @@ private void addPayload(Object payload) {
223223
/**
224224
* The list of requests in this bulk request.
225225
*/
226-
public List<DocWriteRequest> requests() {
226+
public List<DocWriteRequest<?>> requests() {
227227
return this.requests;
228228
}
229229

@@ -527,7 +527,7 @@ private int findNextMarker(byte marker, int from, BytesReference data, int lengt
527527
* @return Whether this bulk request contains index request with an ingest pipeline enabled.
528528
*/
529529
public boolean hasIndexRequestsWithPipelines() {
530-
for (DocWriteRequest actionRequest : requests) {
530+
for (DocWriteRequest<?> actionRequest : requests) {
531531
if (actionRequest instanceof IndexRequest) {
532532
IndexRequest indexRequest = (IndexRequest) actionRequest;
533533
if (Strings.hasText(indexRequest.getPipeline())) {
@@ -545,7 +545,7 @@ public ActionRequestValidationException validate() {
545545
if (requests.isEmpty()) {
546546
validationException = addValidationError("no requests added", validationException);
547547
}
548-
for (DocWriteRequest request : requests) {
548+
for (DocWriteRequest<?> request : requests) {
549549
// We first check if refresh has been set
550550
if (((WriteRequest<?>) request).getRefreshPolicy() != RefreshPolicy.NONE) {
551551
validationException = addValidationError(
@@ -580,7 +580,7 @@ public void writeTo(StreamOutput out) throws IOException {
580580
super.writeTo(out);
581581
waitForActiveShards.writeTo(out);
582582
out.writeVInt(requests.size());
583-
for (DocWriteRequest request : requests) {
583+
for (DocWriteRequest<?> request : requests) {
584584
DocWriteRequest.writeDocumentRequest(out, request);
585585
}
586586
refreshPolicy.writeTo(out);

‎server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ protected void doExecute(Task task, BulkRequest bulkRequest, ActionListener<Bulk
148148
final Set<String> indices = bulkRequest.requests.stream()
149149
// delete requests should not attempt to create the index (if the index does not
150150
// exists), unless an external versioning is used
151-
.filter(request -> request.opType() != DocWriteRequest.OpType.DELETE
152-
|| request.versionType() == VersionType.EXTERNAL
151+
.filter(request -> request.opType() != DocWriteRequest.OpType.DELETE
152+
|| request.versionType() == VersionType.EXTERNAL
153153
|| request.versionType() == VersionType.EXTERNAL_GTE)
154154
.map(DocWriteRequest::index)
155155
.collect(Collectors.toSet());
@@ -189,7 +189,7 @@ public void onFailure(Exception e) {
189189
if (!(ExceptionsHelper.unwrapCause(e) instanceof ResourceAlreadyExistsException)) {
190190
// fail all requests involving this index, if create didn't work
191191
for (int i = 0; i < bulkRequest.requests.size(); i++) {
192-
DocWriteRequest request = bulkRequest.requests.get(i);
192+
DocWriteRequest<?> request = bulkRequest.requests.get(i);
193193
if (request != null && setResponseFailureIfIndexMatches(responses, i, request, index, e)) {
194194
bulkRequest.requests.set(i, null);
195195
}
@@ -226,7 +226,7 @@ void createIndex(String index, TimeValue timeout, ActionListener<CreateIndexResp
226226
client.admin().indices().create(createIndexRequest, listener);
227227
}
228228

229-
private boolean setResponseFailureIfIndexMatches(AtomicArray<BulkItemResponse> responses, int idx, DocWriteRequest request, String index, Exception e) {
229+
private boolean setResponseFailureIfIndexMatches(AtomicArray<BulkItemResponse> responses, int idx, DocWriteRequest<?> request, String index, Exception e) {
230230
if (index.equals(request.index())) {
231231
responses.set(idx, new BulkItemResponse(idx, request.opType(), new BulkItemResponse.Failure(request.index(), request.type(), request.id(), e)));
232232
return true;
@@ -276,7 +276,7 @@ protected void doRun() throws Exception {
276276
final ConcreteIndices concreteIndices = new ConcreteIndices(clusterState, indexNameExpressionResolver);
277277
MetaData metaData = clusterState.metaData();
278278
for (int i = 0; i < bulkRequest.requests.size(); i++) {
279-
DocWriteRequest docWriteRequest = bulkRequest.requests.get(i);
279+
DocWriteRequest<?> docWriteRequest = bulkRequest.requests.get(i);
280280
//the request can only be null because we set it to null in the previous step, so it gets ignored
281281
if (docWriteRequest == null) {
282282
continue;
@@ -320,7 +320,7 @@ protected void doRun() throws Exception {
320320
// first, go over all the requests and create a ShardId -> Operations mapping
321321
Map<ShardId, List<BulkItemRequest>> requestsByShard = new HashMap<>();
322322
for (int i = 0; i < bulkRequest.requests.size(); i++) {
323-
DocWriteRequest request = bulkRequest.requests.get(i);
323+
DocWriteRequest<?> request = bulkRequest.requests.get(i);
324324
if (request == null) {
325325
continue;
326326
}
@@ -367,7 +367,7 @@ public void onFailure(Exception e) {
367367
// create failures for all relevant requests
368368
for (BulkItemRequest request : requests) {
369369
final String indexName = concreteIndices.getConcreteIndex(request.index()).getName();
370-
DocWriteRequest docWriteRequest = request.request();
370+
DocWriteRequest<?> docWriteRequest = request.request();
371371
responses.set(request.id(), new BulkItemResponse(request.id(), docWriteRequest.opType(),
372372
new BulkItemResponse.Failure(indexName, docWriteRequest.type(), docWriteRequest.id(), e)));
373373
}
@@ -423,7 +423,7 @@ public void onTimeout(TimeValue timeout) {
423423
});
424424
}
425425

426-
private boolean addFailureIfIndexIsUnavailable(DocWriteRequest request, int idx, final ConcreteIndices concreteIndices,
426+
private boolean addFailureIfIndexIsUnavailable(DocWriteRequest<?> request, int idx, final ConcreteIndices concreteIndices,
427427
final MetaData metaData) {
428428
IndexNotFoundException cannotCreate = indicesThatCannotBeCreated.get(request.index());
429429
if (cannotCreate != null) {
@@ -447,7 +447,7 @@ private boolean addFailureIfIndexIsUnavailable(DocWriteRequest request, int idx,
447447
return false;
448448
}
449449

450-
private void addFailure(DocWriteRequest request, int idx, Exception unavailableException) {
450+
private void addFailure(DocWriteRequest<?> request, int idx, Exception unavailableException) {
451451
BulkItemResponse.Failure failure = new BulkItemResponse.Failure(request.index(), request.type(), request.id(),
452452
unavailableException);
453453
BulkItemResponse bulkItemResponse = new BulkItemResponse(idx, request.opType(), failure);
@@ -476,7 +476,7 @@ Index getConcreteIndex(String indexOrAlias) {
476476
return indices.get(indexOrAlias);
477477
}
478478

479-
Index resolveIfAbsent(DocWriteRequest request) {
479+
Index resolveIfAbsent(DocWriteRequest<?> request) {
480480
Index concreteIndex = indices.get(request.index());
481481
if (concreteIndex == null) {
482482
concreteIndex = indexNameExpressionResolver.concreteSingleIndex(state, request);
@@ -517,7 +517,7 @@ void processBulkIndexIngestRequest(Task task, BulkRequest original, ActionListen
517517
});
518518
}
519519

520-
static final class BulkRequestModifier implements Iterator<DocWriteRequest> {
520+
static final class BulkRequestModifier implements Iterator<DocWriteRequest<?>> {
521521

522522
final BulkRequest bulkRequest;
523523
final SparseFixedBitSet failedSlots;
@@ -533,7 +533,7 @@ static final class BulkRequestModifier implements Iterator<DocWriteRequest> {
533533
}
534534

535535
@Override
536-
public DocWriteRequest next() {
536+
public DocWriteRequest<?> next() {
537537
return bulkRequest.requests().get(++currentSlot);
538538
}
539539

@@ -552,10 +552,10 @@ BulkRequest getBulkRequest() {
552552
modifiedBulkRequest.timeout(bulkRequest.timeout());
553553

554554
int slot = 0;
555-
List<DocWriteRequest> requests = bulkRequest.requests();
555+
List<DocWriteRequest<?>> requests = bulkRequest.requests();
556556
originalSlots = new int[requests.size()]; // oversize, but that's ok
557557
for (int i = 0; i < requests.size(); i++) {
558-
DocWriteRequest request = requests.get(i);
558+
DocWriteRequest<?> request = requests.get(i);
559559
if (failedSlots.get(i) == false) {
560560
modifiedBulkRequest.add(request);
561561
originalSlots[slot++] = i;

‎server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package org.elasticsearch.action.support.replication;
2121

2222
import com.carrotsearch.hppc.cursors.IntObjectCursor;
23+
2324
import org.elasticsearch.ExceptionsHelper;
2425
import org.elasticsearch.action.ActionListener;
2526
import org.elasticsearch.action.support.ActionFilters;

‎server/src/main/java/org/elasticsearch/common/component/AbstractComponent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public AbstractComponent(Settings settings) {
3939
this.settings = settings;
4040
}
4141

42-
public AbstractComponent(Settings settings, Class customClass) {
42+
public AbstractComponent(Settings settings, Class<?> customClass) {
4343
this.logger = LogManager.getLogger(customClass);
4444
this.deprecationLogger = new DeprecationLogger(logger);
4545
this.settings = settings;

‎server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected AbstractLifecycleComponent(Settings settings) {
3535
super(settings);
3636
}
3737

38-
protected AbstractLifecycleComponent(Settings settings, Class customClass) {
38+
protected AbstractLifecycleComponent(Settings settings, Class<?> customClass) {
3939
super(settings, customClass);
4040
}
4141

‎server/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,22 @@
1919

2020
package org.elasticsearch.common.geo.builders;
2121

22-
import org.elasticsearch.common.geo.GeoShapeType;
23-
import org.elasticsearch.common.geo.parsers.ShapeParser;
24-
import org.elasticsearch.common.geo.parsers.GeoWKTParser;
25-
import org.locationtech.spatial4j.shape.Shape;
26-
2722
import org.elasticsearch.ElasticsearchException;
23+
import org.elasticsearch.common.geo.GeoShapeType;
2824
import org.elasticsearch.common.geo.XShapeCollection;
25+
import org.elasticsearch.common.geo.parsers.GeoWKTParser;
26+
import org.elasticsearch.common.geo.parsers.ShapeParser;
2927
import org.elasticsearch.common.io.stream.StreamInput;
3028
import org.elasticsearch.common.io.stream.StreamOutput;
3129
import org.elasticsearch.common.xcontent.XContentBuilder;
30+
import org.locationtech.spatial4j.shape.Shape;
3231

3332
import java.io.IOException;
3433
import java.util.ArrayList;
3534
import java.util.List;
3635
import java.util.Objects;
3736

38-
public class GeometryCollectionBuilder extends ShapeBuilder {
37+
public class GeometryCollectionBuilder extends ShapeBuilder<Shape, GeometryCollectionBuilder> {
3938

4039
public static final GeoShapeType TYPE = GeoShapeType.GEOMETRYCOLLECTION;
4140

‎server/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,22 @@
2020
package org.elasticsearch.common.geo.builders;
2121

2222
import org.elasticsearch.common.geo.GeoShapeType;
23-
import org.elasticsearch.common.geo.parsers.ShapeParser;
24-
import org.elasticsearch.common.geo.parsers.GeoWKTParser;
25-
import org.locationtech.spatial4j.shape.Shape;
26-
import org.locationtech.jts.geom.Coordinate;
27-
2823
import org.elasticsearch.common.geo.XShapeCollection;
24+
import org.elasticsearch.common.geo.parsers.GeoWKTParser;
25+
import org.elasticsearch.common.geo.parsers.ShapeParser;
2926
import org.elasticsearch.common.io.stream.StreamInput;
3027
import org.elasticsearch.common.io.stream.StreamOutput;
3128
import org.elasticsearch.common.xcontent.XContentBuilder;
29+
import org.locationtech.jts.geom.Coordinate;
30+
import org.locationtech.spatial4j.shape.Shape;
3231

3332
import java.io.IOException;
3433
import java.util.ArrayList;
3534
import java.util.List;
3635
import java.util.Locale;
3736
import java.util.Objects;
3837

39-
public class MultiPolygonBuilder extends ShapeBuilder {
38+
public class MultiPolygonBuilder extends ShapeBuilder<Shape, MultiPolygonBuilder> {
4039

4140
public static final GeoShapeType TYPE = GeoShapeType.MULTIPOLYGON;
4241

0 commit comments

Comments
 (0)