Skip to content

Commit b3478e2

Browse files
jakelandiskcm
jakelandis
authored and
kcm
committed
Enforce 140 char line lengths for packages action.bulk/delete/explain/get/index (#34885)
part of #34884
1 parent 7d74cf9 commit b3478e2

16 files changed

+81
-59
lines changed

‎buildSrc/src/main/resources/checkstyle_suppressions.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,6 @@
7878
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]stats[/\\]TransportClusterStatsAction.java" checks="LineLength" />
7979
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]tasks[/\\]PendingClusterTasksRequestBuilder.java" checks="LineLength" />
8080
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]tasks[/\\]TransportPendingClusterTasksAction.java" checks="LineLength" />
81-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]BackoffPolicy.java" checks="LineLength" />
82-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]BulkProcessor.java" checks="LineLength" />
83-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]BulkRequest.java" checks="LineLength" />
84-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]BulkResponse.java" checks="LineLength" />
85-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]TransportBulkAction.java" checks="LineLength" />
86-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]TransportShardBulkAction.java" checks="LineLength" />
87-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]delete[/\\]DeleteRequest.java" checks="LineLength" />
88-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]explain[/\\]TransportExplainAction.java" checks="LineLength" />
89-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]GetRequest.java" checks="LineLength" />
90-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]MultiGetRequest.java" checks="LineLength" />
91-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]TransportGetAction.java" checks="LineLength" />
92-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]TransportShardMultiGetAction.java" checks="LineLength" />
93-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]index[/\\]IndexRequest.java" checks="LineLength" />
9481
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]MultiSearchRequestBuilder.java" checks="LineLength" />
9582
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]SearchPhaseController.java" checks="LineLength" />
9683
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]DelegatingActionListener.java" checks="LineLength" />
@@ -291,9 +278,6 @@
291278
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]snapshots[/\\]SnapshotBlocksIT.java" checks="LineLength" />
292279
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]state[/\\]ClusterStateRequestTests.java" checks="LineLength" />
293280
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]stats[/\\]ClusterStatsIT.java" checks="LineLength" />
294-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]BulkRequestTests.java" checks="LineLength" />
295-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]RetryTests.java" checks="LineLength" />
296-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]MultiGetShardRequestTests.java" checks="LineLength" />
297281
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]SearchRequestBuilderTests.java" checks="LineLength" />
298282
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]WaitActiveShardCountIT.java" checks="LineLength" />
299283
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]node[/\\]TransportBroadcastByNodeActionTests.java" checks="LineLength" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
* semantics:
3535
*
3636
* <ul>
37-
* <li><code>#hasNext()</code> determines whether the progression has more elements. Return <code>true</code> for infinite progressions</li>
37+
* <li><code>#hasNext()</code> determines whether the progression has more elements. Return <code>true</code> for infinite progressions
38+
* </li>
3839
* <li><code>#next()</code> determines the next element in the progression, i.e. the next wait time period</li>
3940
* </ul>
4041
*

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,13 @@ public void close() {
217217
* Closes the processor. If flushing by time is enabled, then it's shutdown. Any remaining bulk actions are flushed.
218218
* <p>
219219
* If concurrent requests are not enabled, returns {@code true} immediately.
220-
* If concurrent requests are enabled, waits for up to the specified timeout for all bulk requests to complete then returns {@code true},
220+
* If concurrent requests are enabled, waits for up to the specified timeout for all bulk requests to complete then returns {@code true}
221221
* If the specified waiting time elapses before all bulk requests complete, {@code false} is returned.
222222
*
223223
* @param timeout The maximum time to wait for the bulk requests to complete
224224
* @param unit The time unit of the {@code timeout} argument
225-
* @return {@code true} if all bulk requests completed and {@code false} if the waiting time elapsed before all the bulk requests completed
225+
* @return {@code true} if all bulk requests completed and {@code false} if the waiting time elapsed before all the bulk requests
226+
* completed
226227
* @throws InterruptedException If the current thread is interrupted
227228
*/
228229
public synchronized boolean awaitClose(long timeout, TimeUnit unit) throws InterruptedException {
@@ -298,7 +299,8 @@ public BulkProcessor add(BytesReference data, @Nullable String defaultIndex, @Nu
298299
* Adds the data from the bytes to be processed by the bulk processor
299300
*/
300301
public synchronized BulkProcessor add(BytesReference data, @Nullable String defaultIndex, @Nullable String defaultType,
301-
@Nullable String defaultPipeline, @Nullable Object payload, XContentType xContentType) throws Exception {
302+
@Nullable String defaultPipeline, @Nullable Object payload,
303+
XContentType xContentType) throws Exception {
302304
bulkRequest.add(data, defaultIndex, defaultType, null, null, defaultPipeline, payload, true, xContentType);
303305
executeIfNeeded();
304306
return this;

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,20 +369,23 @@ public BulkRequest add(BytesReference data, @Nullable String defaultIndex, @Null
369369
} else if (SOURCE.match(currentFieldName, parser.getDeprecationHandler())) {
370370
fetchSourceContext = FetchSourceContext.fromXContent(parser);
371371
} else {
372-
throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");
372+
throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter ["
373+
+ currentFieldName + "]");
373374
}
374375
} else if (token == XContentParser.Token.START_ARRAY) {
375376
throw new IllegalArgumentException("Malformed action/metadata line [" + line +
376377
"], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");
377-
} else if (token == XContentParser.Token.START_OBJECT && SOURCE.match(currentFieldName, parser.getDeprecationHandler())) {
378+
} else if (token == XContentParser.Token.START_OBJECT && SOURCE.match(currentFieldName,
379+
parser.getDeprecationHandler())) {
378380
fetchSourceContext = FetchSourceContext.fromXContent(parser);
379381
} else if (token != XContentParser.Token.VALUE_NULL) {
380-
throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");
382+
throw new IllegalArgumentException("Malformed action/metadata line [" + line
383+
+ "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");
381384
}
382385
}
383386
} else if (token != XContentParser.Token.END_OBJECT) {
384-
throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected " + XContentParser.Token.START_OBJECT
385-
+ " or " + XContentParser.Token.END_OBJECT + " but found [" + token + "]");
387+
throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected "
388+
+ XContentParser.Token.START_OBJECT + " or " + XContentParser.Token.END_OBJECT + " but found [" + token + "]");
386389
}
387390

388391
if ("delete".equals(action)) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ public String buildFailureMessage() {
109109
BulkItemResponse response = responses[i];
110110
if (response.isFailed()) {
111111
sb.append("\n[").append(i)
112-
.append("]: index [").append(response.getIndex()).append("], type [").append(response.getType()).append("], id [").append(response.getId())
112+
.append("]: index [").append(response.getIndex()).append("], type [")
113+
.append(response.getType()).append("], id [").append(response.getId())
113114
.append("], message [").append(response.getFailureMessage()).append("]");
114115
}
115116
}

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

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,11 @@ void createIndex(String index, TimeValue timeout, ActionListener<CreateIndexResp
256256
client.admin().indices().create(createIndexRequest, listener);
257257
}
258258

259-
private boolean setResponseFailureIfIndexMatches(AtomicArray<BulkItemResponse> responses, int idx, DocWriteRequest<?> request, String index, Exception e) {
259+
private boolean setResponseFailureIfIndexMatches(AtomicArray<BulkItemResponse> responses, int idx, DocWriteRequest<?> request,
260+
String index, Exception e) {
260261
if (index.equals(request.index())) {
261-
responses.set(idx, new BulkItemResponse(idx, request.opType(), new BulkItemResponse.Failure(request.index(), request.type(), request.id(), e)));
262+
responses.set(idx, new BulkItemResponse(idx, request.opType(), new BulkItemResponse.Failure(request.index(), request.type(),
263+
request.id(), e)));
262264
return true;
263265
}
264266
return false;
@@ -327,19 +329,22 @@ protected void doRun() throws Exception {
327329
indexRequest.process(indexCreated, mappingMd, concreteIndex.getName());
328330
break;
329331
case UPDATE:
330-
TransportUpdateAction.resolveAndValidateRouting(metaData, concreteIndex.getName(), (UpdateRequest) docWriteRequest);
332+
TransportUpdateAction.resolveAndValidateRouting(metaData, concreteIndex.getName(),
333+
(UpdateRequest) docWriteRequest);
331334
break;
332335
case DELETE:
333336
docWriteRequest.routing(metaData.resolveWriteIndexRouting(docWriteRequest.routing(), docWriteRequest.index()));
334337
// check if routing is required, if so, throw error if routing wasn't specified
335-
if (docWriteRequest.routing() == null && metaData.routingRequired(concreteIndex.getName(), docWriteRequest.type())) {
338+
if (docWriteRequest.routing() == null && metaData.routingRequired(concreteIndex.getName(),
339+
docWriteRequest.type())) {
336340
throw new RoutingMissingException(concreteIndex.getName(), docWriteRequest.type(), docWriteRequest.id());
337341
}
338342
break;
339343
default: throw new AssertionError("request type not supported: [" + docWriteRequest.opType() + "]");
340344
}
341345
} catch (ElasticsearchParseException | IllegalArgumentException | RoutingMissingException e) {
342-
BulkItemResponse.Failure failure = new BulkItemResponse.Failure(concreteIndex.getName(), docWriteRequest.type(), docWriteRequest.id(), e);
346+
BulkItemResponse.Failure failure = new BulkItemResponse.Failure(concreteIndex.getName(), docWriteRequest.type(),
347+
docWriteRequest.id(), e);
343348
BulkItemResponse bulkItemResponse = new BulkItemResponse(i, docWriteRequest.opType(), failure);
344349
responses.set(i, bulkItemResponse);
345350
// make sure the request gets never processed again
@@ -355,13 +360,15 @@ protected void doRun() throws Exception {
355360
continue;
356361
}
357362
String concreteIndex = concreteIndices.getConcreteIndex(request.index()).getName();
358-
ShardId shardId = clusterService.operationRouting().indexShards(clusterState, concreteIndex, request.id(), request.routing()).shardId();
363+
ShardId shardId = clusterService.operationRouting().indexShards(clusterState, concreteIndex, request.id(),
364+
request.routing()).shardId();
359365
List<BulkItemRequest> shardRequests = requestsByShard.computeIfAbsent(shardId, shard -> new ArrayList<>());
360366
shardRequests.add(new BulkItemRequest(i, request));
361367
}
362368

363369
if (requestsByShard.isEmpty()) {
364-
listener.onResponse(new BulkResponse(responses.toArray(new BulkItemResponse[responses.length()]), buildTookInMillis(startTimeNanos)));
370+
listener.onResponse(new BulkResponse(responses.toArray(new BulkItemResponse[responses.length()]),
371+
buildTookInMillis(startTimeNanos)));
365372
return;
366373
}
367374

@@ -407,7 +414,8 @@ public void onFailure(Exception e) {
407414
}
408415

409416
private void finishHim() {
410-
listener.onResponse(new BulkResponse(responses.toArray(new BulkItemResponse[responses.length()]), buildTookInMillis(startTimeNanos)));
417+
listener.onResponse(new BulkResponse(responses.toArray(new BulkItemResponse[responses.length()]),
418+
buildTookInMillis(startTimeNanos)));
411419
}
412420
});
413421
}
@@ -535,7 +543,8 @@ void processBulkIndexIngestRequest(Task task, BulkRequest original, ActionListen
535543
} else {
536544
long ingestTookInMillis = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - ingestStartTimeInNanos);
537545
BulkRequest bulkRequest = bulkRequestModifier.getBulkRequest();
538-
ActionListener<BulkResponse> actionListener = bulkRequestModifier.wrapActionListenerIfNeeded(ingestTookInMillis, listener);
546+
ActionListener<BulkResponse> actionListener = bulkRequestModifier.wrapActionListenerIfNeeded(ingestTookInMillis,
547+
listener);
539548
if (bulkRequest.requests().isEmpty()) {
540549
// at this stage, the transport bulk action can't deal with a bulk request with no requests,
541550
// so we stop and send an empty response back to the client.
@@ -628,7 +637,8 @@ void markCurrentItemAsFailed(Exception e) {
628637
// 2) Add a bulk item failure for this request
629638
// 3) Continue with the next request in the bulk.
630639
failedSlots.set(currentSlot);
631-
BulkItemResponse.Failure failure = new BulkItemResponse.Failure(indexRequest.index(), indexRequest.type(), indexRequest.id(), e);
640+
BulkItemResponse.Failure failure = new BulkItemResponse.Failure(indexRequest.index(), indexRequest.type(),
641+
indexRequest.id(), e);
632642
itemResponses.add(new BulkItemResponse(currentSlot, indexRequest.opType(), failure));
633643
}
634644

@@ -641,7 +651,8 @@ static final class IngestBulkResponseListener implements ActionListener<BulkResp
641651
private final List<BulkItemResponse> itemResponses;
642652
private final ActionListener<BulkResponse> actionListener;
643653

644-
IngestBulkResponseListener(long ingestTookInMillis, int[] originalSlots, List<BulkItemResponse> itemResponses, ActionListener<BulkResponse> actionListener) {
654+
IngestBulkResponseListener(long ingestTookInMillis, int[] originalSlots, List<BulkItemResponse> itemResponses,
655+
ActionListener<BulkResponse> actionListener) {
645656
this.ingestTookInMillis = ingestTookInMillis;
646657
this.itemResponses = itemResponses;
647658
this.actionListener = actionListener;

‎server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
* @see org.elasticsearch.client.Client#delete(DeleteRequest)
4747
* @see org.elasticsearch.client.Requests#deleteRequest(String)
4848
*/
49-
public class DeleteRequest extends ReplicatedWriteRequest<DeleteRequest> implements DocWriteRequest<DeleteRequest>, CompositeIndicesRequest {
49+
public class DeleteRequest extends ReplicatedWriteRequest<DeleteRequest>
50+
implements DocWriteRequest<DeleteRequest>, CompositeIndicesRequest {
5051

5152
private String type;
5253
private String id;
@@ -89,7 +90,8 @@ public ActionRequestValidationException validate() {
8990
validationException = addValidationError("id is missing", validationException);
9091
}
9192
if (!versionType.validateVersionForWrites(version)) {
92-
validationException = addValidationError("illegal version value [" + version + "] for version type [" + versionType.name() + "]", validationException);
93+
validationException = addValidationError("illegal version value [" + version + "] for version type ["
94+
+ versionType.name() + "]", validationException);
9395
}
9496
if (versionType == VersionType.FORCE) {
9597
validationException = addValidationError("version type [force] may no longer be used", validationException);

0 commit comments

Comments
 (0)