Skip to content

Commit b6798d5

Browse files
not-napoleonnot-napoleon
authored
Fix/line length cleanup action support backport (#34924)
1 parent 22a91a2 commit b6798d5

23 files changed

+217
-150
lines changed

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,6 @@
8585
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]MultiSearchRequestBuilder.java" checks="LineLength" />
8686
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]SearchPhaseController.java" checks="LineLength" />
8787
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]ShardSearchFailure.java" checks="LineLength" />
88-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]DelegatingActionListener.java" checks="LineLength" />
89-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]IndicesOptions.java" checks="LineLength" />
90-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]BroadcastOperationRequestBuilder.java" checks="LineLength" />
91-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]TransportBroadcastAction.java" checks="LineLength" />
92-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]node[/\\]TransportBroadcastByNodeAction.java" checks="LineLength" />
93-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]AcknowledgedRequestBuilder.java" checks="LineLength" />
94-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]MasterNodeOperationRequestBuilder.java" checks="LineLength" />
95-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]MasterNodeReadOperationRequestBuilder.java" checks="LineLength" />
96-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]info[/\\]ClusterInfoRequest.java" checks="LineLength" />
97-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]info[/\\]ClusterInfoRequestBuilder.java" checks="LineLength" />
98-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]info[/\\]TransportClusterInfoAction.java" checks="LineLength" />
99-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]nodes[/\\]NodesOperationRequestBuilder.java" checks="LineLength" />
100-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]replication[/\\]ReplicationRequestBuilder.java" checks="LineLength" />
101-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]replication[/\\]TransportBroadcastReplicationAction.java" checks="LineLength" />
102-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]single[/\\]instance[/\\]InstanceShardOperationRequestBuilder.java" checks="LineLength" />
103-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]single[/\\]instance[/\\]TransportInstanceSingleOperationAction.java" checks="LineLength" />
104-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]single[/\\]shard[/\\]SingleShardOperationRequestBuilder.java" checks="LineLength" />
105-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]single[/\\]shard[/\\]TransportSingleShardAction.java" checks="LineLength" />
10688
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]termvectors[/\\]MultiTermVectorsRequest.java" checks="LineLength" />
10789
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]termvectors[/\\]MultiTermVectorsRequestBuilder.java" checks="LineLength" />
10890
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]termvectors[/\\]TermVectorsRequest.java" checks="LineLength" />
@@ -231,12 +213,6 @@
231213
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]state[/\\]ClusterStateRequestTests.java" checks="LineLength" />
232214
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]admin[/\\]cluster[/\\]stats[/\\]ClusterStatsIT.java" checks="LineLength" />
233215
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]SearchRequestBuilderTests.java" checks="LineLength" />
234-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]TransportActionFilterChainTests.java" checks="LineLength" />
235-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]WaitActiveShardCountIT.java" checks="LineLength" />
236-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]node[/\\]TransportBroadcastByNodeActionTests.java" checks="LineLength" />
237-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]TransportMasterNodeActionTests.java" checks="LineLength" />
238-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]replication[/\\]BroadcastReplicationTests.java" checks="LineLength" />
239-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]single[/\\]instance[/\\]TransportInstanceSingleOperationActionTests.java" checks="LineLength" />
240216
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]termvectors[/\\]AbstractTermVectorsTestCase.java" checks="LineLength" />
241217
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]termvectors[/\\]GetTermVectorsIT.java" checks="LineLength" />
242218
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]termvectors[/\\]MultiTermVectorsIT.java" checks="LineLength" />

‎server/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
import org.elasticsearch.action.ActionListener;
2626
import org.elasticsearch.action.ActionResponse;
2727

28-
public abstract class DelegatingActionListener<Instigator extends ActionResponse, Delegated extends ActionResponse> implements ActionListener<Instigator> {
28+
public abstract class DelegatingActionListener<Instigator extends ActionResponse, Delegated extends ActionResponse>
29+
implements ActionListener<Instigator> {
2930

3031
ActionListener<Delegated> delegatedActionListener;
3132

‎server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@
2424
import org.elasticsearch.action.support.IndicesOptions;
2525
import org.elasticsearch.client.ElasticsearchClient;
2626

27-
public abstract class BroadcastOperationRequestBuilder<Request extends BroadcastRequest<Request>, Response extends BroadcastResponse, RequestBuilder extends BroadcastOperationRequestBuilder<Request, Response, RequestBuilder>>
28-
extends ActionRequestBuilder<Request, Response, RequestBuilder> {
27+
public abstract class BroadcastOperationRequestBuilder<
28+
Request extends BroadcastRequest<Request>,
29+
Response extends BroadcastResponse,
30+
RequestBuilder extends BroadcastOperationRequestBuilder<Request, Response, RequestBuilder>
31+
> extends ActionRequestBuilder<Request, Response, RequestBuilder> {
2932

30-
protected BroadcastOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
33+
protected BroadcastOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action,
34+
Request request) {
3135
super(client, action, request);
3236
}
3337

‎server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,12 @@
5151
import java.util.concurrent.atomic.AtomicReferenceArray;
5252
import java.util.function.Supplier;
5353

54-
public abstract class TransportBroadcastAction<Request extends BroadcastRequest<Request>, Response extends BroadcastResponse, ShardRequest extends BroadcastShardRequest, ShardResponse extends BroadcastShardResponse>
55-
extends HandledTransportAction<Request, Response> {
54+
public abstract class TransportBroadcastAction<
55+
Request extends BroadcastRequest<Request>,
56+
Response extends BroadcastResponse,
57+
ShardRequest extends BroadcastShardRequest,
58+
ShardResponse extends BroadcastShardResponse
59+
> extends HandledTransportAction<Request, Response> {
5660

5761
protected final ClusterService clusterService;
5862
protected final TransportService transportService;
@@ -61,8 +65,9 @@ public abstract class TransportBroadcastAction<Request extends BroadcastRequest<
6165
private final String shardExecutor;
6266

6367
protected TransportBroadcastAction(Settings settings, String actionName, ThreadPool threadPool, ClusterService clusterService,
64-
TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
65-
Supplier<Request> request, Supplier<ShardRequest> shardRequest, String shardExecutor) {
68+
TransportService transportService, ActionFilters actionFilters,
69+
IndexNameExpressionResolver indexNameExpressionResolver, Supplier<Request> request,
70+
Supplier<ShardRequest> shardRequest, String shardExecutor) {
6671
super(settings, actionName, threadPool, transportService, actionFilters, indexNameExpressionResolver, request);
6772
this.clusterService = clusterService;
6873
this.transportService = transportService;
@@ -175,29 +180,30 @@ protected void performOperation(final ShardIterator shardIt, final ShardRouting
175180
// no node connected, act as failure
176181
onOperation(shard, shardIt, shardIndex, new NoShardAvailableActionException(shardIt.shardId()));
177182
} else {
178-
transportService.sendRequest(node, transportShardAction, shardRequest, new TransportResponseHandler<ShardResponse>() {
179-
@Override
180-
public ShardResponse read(StreamInput in) throws IOException {
181-
ShardResponse response = newShardResponse();
182-
response.readFrom(in);
183-
return response;
184-
}
185-
186-
@Override
187-
public String executor() {
188-
return ThreadPool.Names.SAME;
189-
}
190-
191-
@Override
192-
public void handleResponse(ShardResponse response) {
193-
onOperation(shard, shardIndex, response);
194-
}
195-
196-
@Override
197-
public void handleException(TransportException e) {
198-
onOperation(shard, shardIt, shardIndex, e);
199-
}
200-
});
183+
transportService.sendRequest(node, transportShardAction, shardRequest,
184+
new TransportResponseHandler<ShardResponse>() {
185+
@Override
186+
public ShardResponse read(StreamInput in) throws IOException {
187+
ShardResponse response = newShardResponse();
188+
response.readFrom(in);
189+
return response;
190+
}
191+
192+
@Override
193+
public String executor() {
194+
return ThreadPool.Names.SAME;
195+
}
196+
197+
@Override
198+
public void handleResponse(ShardResponse response) {
199+
onOperation(shard, shardIndex, response);
200+
}
201+
202+
@Override
203+
public void handleException(TransportException e) {
204+
onOperation(shard, shardIt, shardIndex, e);
205+
}
206+
});
201207
}
202208
} catch (Exception e) {
203209
onOperation(shard, shardIt, shardIndex, e);
@@ -225,7 +231,8 @@ void onOperation(@Nullable ShardRouting shard, final ShardIterator shardIt, int
225231
if (logger.isTraceEnabled()) {
226232
if (!TransportActions.isShardNotAvailableException(e)) {
227233
logger.trace(new ParameterizedMessage(
228-
"{}: failed to execute [{}]", shard != null ? shard.shortSummary() : shardIt.shardId(), request), e);
234+
"{}: failed to execute [{}]", shard != null ? shard.shortSummary() : shardIt.shardId(),
235+
request), e);
229236
}
230237
}
231238
}
@@ -235,7 +242,8 @@ void onOperation(@Nullable ShardRouting shard, final ShardIterator shardIt, int
235242
if (e != null) {
236243
if (!TransportActions.isShardNotAvailableException(e)) {
237244
logger.debug(new ParameterizedMessage(
238-
"{}: failed to execute [{}]", shard != null ? shard.shortSummary() : shardIt.shardId(), request), e);
245+
"{}: failed to execute [{}]", shard != null ? shard.shortSummary() : shardIt.shardId(),
246+
request), e);
239247
}
240248
}
241249
}

‎server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ private Response newResponse(
145145
successfulShards += response.getSuccessfulShards();
146146
for (BroadcastShardOperationFailedException throwable : response.getExceptions()) {
147147
if (!TransportActions.isShardNotAvailableException(throwable)) {
148-
exceptions.add(new DefaultShardOperationFailedException(throwable.getShardId().getIndexName(), throwable.getShardId().getId(), throwable));
148+
exceptions.add(new DefaultShardOperationFailedException(throwable.getShardId().getIndexName(),
149+
throwable.getShardId().getId(), throwable));
149150
}
150151
}
151152
}
@@ -175,7 +176,9 @@ private Response newResponse(
175176
* @param clusterState the cluster state
176177
* @return the response
177178
*/
178-
protected abstract Response newResponse(Request request, int totalShards, int successfulShards, int failedShards, List<ShardOperationResult> results, List<DefaultShardOperationFailedException> shardFailures, ClusterState clusterState);
179+
protected abstract Response newResponse(Request request, int totalShards, int successfulShards, int failedShards,
180+
List<ShardOperationResult> results, List<DefaultShardOperationFailedException> shardFailures,
181+
ClusterState clusterState);
179182

180183
/**
181184
* Deserialize a request from an input stream
@@ -424,7 +427,8 @@ public void messageReceived(final NodeRequest request, TransportChannel channel)
424427
channel.sendResponse(new NodeResponse(request.getNodeId(), totalShards, results, accumulatedExceptions));
425428
}
426429

427-
private void onShardOperation(final NodeRequest request, final Object[] shardResults, final int shardIndex, final ShardRouting shardRouting) {
430+
private void onShardOperation(final NodeRequest request, final Object[] shardResults, final int shardIndex,
431+
final ShardRouting shardRouting) {
428432
try {
429433
if (logger.isTraceEnabled()) {
430434
logger.trace("[{}] executing operation for shard [{}]", actionName, shardRouting.shortSummary());

‎server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@
2525
/**
2626
* Base request builder for master node operations that support acknowledgements
2727
*/
28-
public abstract class AcknowledgedRequestBuilder<Request extends AcknowledgedRequest<Request>, Response extends AcknowledgedResponse, RequestBuilder extends AcknowledgedRequestBuilder<Request, Response, RequestBuilder>>
29-
extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
28+
public abstract class AcknowledgedRequestBuilder<
29+
Request extends AcknowledgedRequest<Request>,
30+
Response extends AcknowledgedResponse,
31+
RequestBuilder extends AcknowledgedRequestBuilder<Request, Response, RequestBuilder>
32+
> extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
3033

3134
protected AcknowledgedRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
3235
super(client, action, request);

‎server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,14 @@
2828
/**
2929
* Base request builder for master node operations
3030
*/
31-
public abstract class MasterNodeOperationRequestBuilder<Request extends MasterNodeRequest<Request>, Response extends ActionResponse, RequestBuilder extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder>>
32-
extends ActionRequestBuilder<Request, Response, RequestBuilder> {
31+
public abstract class MasterNodeOperationRequestBuilder<
32+
Request extends MasterNodeRequest<Request>,
33+
Response extends ActionResponse,
34+
RequestBuilder extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder>
35+
> extends ActionRequestBuilder<Request, Response, RequestBuilder> {
3336

34-
protected MasterNodeOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
37+
protected MasterNodeOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action,
38+
Request request) {
3539
super(client, action, request);
3640
}
3741

‎server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@
2626
/**
2727
* Base request builder for master node read operations that can be executed on the local node as well
2828
*/
29-
public abstract class MasterNodeReadOperationRequestBuilder<Request extends MasterNodeReadRequest<Request>, Response extends ActionResponse, RequestBuilder extends MasterNodeReadOperationRequestBuilder<Request, Response, RequestBuilder>>
30-
extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
29+
public abstract class MasterNodeReadOperationRequestBuilder<
30+
Request extends MasterNodeReadRequest<Request>,
31+
Response extends ActionResponse,
32+
RequestBuilder extends MasterNodeReadOperationRequestBuilder<Request, Response, RequestBuilder>
33+
> extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
3134

32-
protected MasterNodeReadOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
35+
protected MasterNodeReadOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action,
36+
Request request) {
3337
super(client, action, request);
3438
}
3539

‎server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828

2929
import java.io.IOException;
3030

31-
public abstract class ClusterInfoRequest<Request extends ClusterInfoRequest<Request>> extends MasterNodeReadRequest<Request> implements IndicesRequest.Replaceable {
31+
public abstract class ClusterInfoRequest<Request extends ClusterInfoRequest<Request>> extends MasterNodeReadRequest<Request>
32+
implements IndicesRequest.Replaceable {
3233

3334
private String[] indices = Strings.EMPTY_ARRAY;
3435
private String[] types = Strings.EMPTY_ARRAY;

0 commit comments

Comments
 (0)