Skip to content

Commit f2280c4

Browse files
jdconradjdconrad
committed
[Style] Remove line length violations from ingest actions (#34886)
1 parent 2df3040 commit f2280c4

10 files changed

+46
-37
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,6 @@
9797
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]TransportGetAction.java" checks="LineLength" />
9898
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]TransportShardMultiGetAction.java" checks="LineLength" />
9999
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]index[/\\]IndexRequest.java" checks="LineLength" />
100-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]DeletePipelineRequestBuilder.java" checks="LineLength" />
101-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]DeletePipelineTransportAction.java" checks="LineLength" />
102-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]GetPipelineRequestBuilder.java" checks="LineLength" />
103-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]GetPipelineTransportAction.java" checks="LineLength" />
104-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]PutPipelineTransportAction.java" checks="LineLength" />
105-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]SimulatePipelineRequest.java" checks="LineLength" />
106-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]SimulatePipelineRequestBuilder.java" checks="LineLength" />
107-
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]SimulatePipelineTransportAction.java" checks="LineLength" />
108100
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]MultiSearchRequestBuilder.java" checks="LineLength" />
109101
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]SearchPhaseController.java" checks="LineLength" />
110102
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]ShardSearchFailure.java" checks="LineLength" />
@@ -344,10 +336,6 @@
344336
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]BulkRequestTests.java" checks="LineLength" />
345337
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]bulk[/\\]RetryTests.java" checks="LineLength" />
346338
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]get[/\\]MultiGetShardRequestTests.java" checks="LineLength" />
347-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]SimulateExecutionServiceTests.java" checks="LineLength" />
348-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]SimulatePipelineRequestParsingTests.java" checks="LineLength" />
349-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]SimulatePipelineResponseTests.java" checks="LineLength" />
350-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]ingest[/\\]WriteableIngestDocumentTests.java" checks="LineLength" />
351339
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]search[/\\]SearchRequestBuilderTests.java" checks="LineLength" />
352340
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]TransportActionFilterChainTests.java" checks="LineLength" />
353341
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]WaitActiveShardCountIT.java" checks="LineLength" />

‎server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import org.elasticsearch.action.support.master.AcknowledgedResponse;
2424
import org.elasticsearch.client.ElasticsearchClient;
2525

26-
public class DeletePipelineRequestBuilder extends ActionRequestBuilder<DeletePipelineRequest, AcknowledgedResponse, DeletePipelineRequestBuilder> {
26+
public class DeletePipelineRequestBuilder
27+
extends ActionRequestBuilder<DeletePipelineRequest, AcknowledgedResponse, DeletePipelineRequestBuilder> {
2728

2829
public DeletePipelineRequestBuilder(ElasticsearchClient client, DeletePipelineAction action) {
2930
super(client, action, new DeletePipelineRequest());

‎server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
2323
import org.elasticsearch.client.ElasticsearchClient;
2424

25-
public class GetPipelineRequestBuilder extends MasterNodeReadOperationRequestBuilder<GetPipelineRequest, GetPipelineResponse, GetPipelineRequestBuilder> {
25+
public class GetPipelineRequestBuilder
26+
extends MasterNodeReadOperationRequestBuilder<GetPipelineRequest, GetPipelineResponse, GetPipelineRequestBuilder> {
2627

2728
public GetPipelineRequestBuilder(ElasticsearchClient client, GetPipelineAction action) {
2829
super(client, action, new GetPipelineRequest());

‎server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public GetPipelineTransportAction(Settings settings, ThreadPool threadPool, Clus
4040
TransportService transportService, ActionFilters actionFilters,
4141
IndexNameExpressionResolver indexNameExpressionResolver) {
4242
super(settings, GetPipelineAction.NAME, transportService, clusterService, threadPool, actionFilters,
43-
indexNameExpressionResolver, GetPipelineRequest::new);
43+
indexNameExpressionResolver, GetPipelineRequest::new);
4444
}
4545

4646
@Override
@@ -54,7 +54,8 @@ protected GetPipelineResponse newResponse() {
5454
}
5555

5656
@Override
57-
protected void masterOperation(GetPipelineRequest request, ClusterState state, ActionListener<GetPipelineResponse> listener) throws Exception {
57+
protected void masterOperation(GetPipelineRequest request, ClusterState state, ActionListener<GetPipelineResponse> listener)
58+
throws Exception {
5859
listener.onResponse(new GetPipelineResponse(IngestService.getPipelines(state, request.getIds())));
5960
}
6061

‎server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public PutPipelineTransportAction(Settings settings, ThreadPool threadPool, Clus
5454
TransportService transportService, ActionFilters actionFilters,
5555
IndexNameExpressionResolver indexNameExpressionResolver, IngestService ingestService,
5656
TransportNodesInfoAction nodesInfoAction) {
57-
super(settings, PutPipelineAction.NAME, transportService, clusterService, threadPool, actionFilters, indexNameExpressionResolver, PutPipelineRequest::new);
57+
super(settings, PutPipelineAction.NAME, transportService, clusterService, threadPool, actionFilters,
58+
indexNameExpressionResolver, PutPipelineRequest::new);
5859
this.clusterService = clusterService;
5960
this.nodesInfoAction = nodesInfoAction;
6061
this.ingestService = ingestService;
@@ -71,7 +72,8 @@ protected AcknowledgedResponse newResponse() {
7172
}
7273

7374
@Override
74-
protected void masterOperation(PutPipelineRequest request, ClusterState state, ActionListener<AcknowledgedResponse> listener) throws Exception {
75+
protected void masterOperation(PutPipelineRequest request, ClusterState state, ActionListener<AcknowledgedResponse> listener)
76+
throws Exception {
7577
NodesInfoRequest nodesInfoRequest = new NodesInfoRequest();
7678
nodesInfoRequest.clear();
7779
nodesInfoRequest.ingest(true);

‎server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import org.elasticsearch.common.bytes.BytesReference;
2525
import org.elasticsearch.common.xcontent.XContentType;
2626

27-
public class SimulatePipelineRequestBuilder extends ActionRequestBuilder<SimulatePipelineRequest, SimulatePipelineResponse, SimulatePipelineRequestBuilder> {
27+
public class SimulatePipelineRequestBuilder
28+
extends ActionRequestBuilder<SimulatePipelineRequest, SimulatePipelineResponse, SimulatePipelineRequestBuilder> {
2829

2930
/**
3031
* Create a new builder for {@link SimulatePipelineRequest}s

‎server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ public class SimulatePipelineTransportAction extends HandledTransportAction<Simu
3939
private final SimulateExecutionService executionService;
4040

4141
@Inject
42-
public SimulatePipelineTransportAction(Settings settings, ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, NodeService nodeService) {
43-
super(settings, SimulatePipelineAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, SimulatePipelineRequest::new);
42+
public SimulatePipelineTransportAction(Settings settings, ThreadPool threadPool, TransportService transportService,
43+
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, NodeService nodeService) {
44+
super(settings, SimulatePipelineAction.NAME, threadPool, transportService, actionFilters,
45+
indexNameExpressionResolver, SimulatePipelineRequest::new);
4446
this.ingestService = nodeService.getIngestService();
4547
this.executionService = new SimulateExecutionService(threadPool);
4648
}

‎server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ public void testExecuteItem() throws Exception {
103103

104104
public void testExecuteVerboseItemExceptionWithoutOnFailure() throws Exception {
105105
TestProcessor processor1 = new TestProcessor("processor_0", "mock", ingestDocument -> {});
106-
TestProcessor processor2 = new TestProcessor("processor_1", "mock", ingestDocument -> { throw new RuntimeException("processor failed"); });
106+
TestProcessor processor2 = new TestProcessor("processor_1", "mock",
107+
ingestDocument -> { throw new RuntimeException("processor failed"); });
107108
TestProcessor processor3 = new TestProcessor("processor_2", "mock", ingestDocument -> {});
108109
Pipeline pipeline = new Pipeline("_id", "_description", version, new CompoundProcessor(processor1, processor2, processor3));
109110
SimulateDocumentResult actualItemResponse = executionService.executeDocument(pipeline, ingestDocument, true);
@@ -117,7 +118,8 @@ public void testExecuteVerboseItemExceptionWithoutOnFailure() throws Exception {
117118
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getFailure(), nullValue());
118119
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument(), not(sameInstance(ingestDocument)));
119120
assertIngestDocument(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument(), ingestDocument);
120-
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument().getSourceAndMetadata(), not(sameInstance(ingestDocument.getSourceAndMetadata())));
121+
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument().getSourceAndMetadata(),
122+
not(sameInstance(ingestDocument.getSourceAndMetadata())));
121123
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(1).getProcessorTag(), equalTo("processor_1"));
122124
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(1).getIngestDocument(), nullValue());
123125
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(1).getFailure(), instanceOf(RuntimeException.class));
@@ -126,7 +128,8 @@ public void testExecuteVerboseItemExceptionWithoutOnFailure() throws Exception {
126128
}
127129

128130
public void testExecuteVerboseItemWithOnFailure() throws Exception {
129-
TestProcessor processor1 = new TestProcessor("processor_0", "mock", ingestDocument -> { throw new RuntimeException("processor failed"); });
131+
TestProcessor processor1 = new TestProcessor("processor_0", "mock",
132+
ingestDocument -> { throw new RuntimeException("processor failed"); });
130133
TestProcessor processor2 = new TestProcessor("processor_1", "mock", ingestDocument -> {});
131134
TestProcessor processor3 = new TestProcessor("processor_2", "mock", ingestDocument -> {});
132135
Pipeline pipeline = new Pipeline("_id", "_description", version,
@@ -151,7 +154,8 @@ public void testExecuteVerboseItemWithOnFailure() throws Exception {
151154
metadata.put(CompoundProcessor.ON_FAILURE_PROCESSOR_TYPE_FIELD, "mock");
152155
metadata.put(CompoundProcessor.ON_FAILURE_PROCESSOR_TAG_FIELD, "processor_0");
153156
metadata.put(CompoundProcessor.ON_FAILURE_MESSAGE_FIELD, "processor failed");
154-
assertIngestDocument(simulateDocumentVerboseResult.getProcessorResults().get(1).getIngestDocument(), ingestDocumentWithOnFailureMetadata);
157+
assertIngestDocument(simulateDocumentVerboseResult.getProcessorResults().get(1).getIngestDocument(),
158+
ingestDocumentWithOnFailureMetadata);
155159

156160
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(1).getFailure(), nullValue());
157161

@@ -175,7 +179,8 @@ public void testExecuteVerboseItemExceptionWithIgnoreFailure() throws Exception
175179
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getFailure(), sameInstance(exception));
176180
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument(), not(sameInstance(ingestDocument)));
177181
assertIngestDocument(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument(), ingestDocument);
178-
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument().getSourceAndMetadata(), not(sameInstance(ingestDocument.getSourceAndMetadata())));
182+
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument().getSourceAndMetadata(),
183+
not(sameInstance(ingestDocument.getSourceAndMetadata())));
179184
}
180185

181186
public void testExecuteVerboseItemWithoutExceptionAndWithIgnoreFailure() throws Exception {
@@ -191,7 +196,8 @@ public void testExecuteVerboseItemWithoutExceptionAndWithIgnoreFailure() throws
191196
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getFailure(), nullValue());
192197
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument(), not(sameInstance(ingestDocument)));
193198
assertIngestDocument(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument(), ingestDocument);
194-
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument().getSourceAndMetadata(), not(sameInstance(ingestDocument.getSourceAndMetadata())));
199+
assertThat(simulateDocumentVerboseResult.getProcessorResults().get(0).getIngestDocument().getSourceAndMetadata(),
200+
not(sameInstance(ingestDocument.getSourceAndMetadata())));
195201
}
196202

197203
public void testExecuteItemWithFailure() throws Exception {

‎server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,14 @@ public void testSerialization() throws IOException {
5656
Iterator<SimulateDocumentResult> expectedResultIterator = response.getResults().iterator();
5757
for (SimulateDocumentResult result : otherResponse.getResults()) {
5858
if (isVerbose) {
59-
SimulateDocumentVerboseResult expectedSimulateDocumentVerboseResult = (SimulateDocumentVerboseResult) expectedResultIterator.next();
59+
SimulateDocumentVerboseResult expectedSimulateDocumentVerboseResult =
60+
(SimulateDocumentVerboseResult) expectedResultIterator.next();
6061
assertThat(result, instanceOf(SimulateDocumentVerboseResult.class));
6162
SimulateDocumentVerboseResult simulateDocumentVerboseResult = (SimulateDocumentVerboseResult) result;
62-
assertThat(simulateDocumentVerboseResult.getProcessorResults().size(), equalTo(expectedSimulateDocumentVerboseResult.getProcessorResults().size()));
63-
Iterator<SimulateProcessorResult> expectedProcessorResultIterator = expectedSimulateDocumentVerboseResult.getProcessorResults().iterator();
63+
assertThat(simulateDocumentVerboseResult.getProcessorResults().size(),
64+
equalTo(expectedSimulateDocumentVerboseResult.getProcessorResults().size()));
65+
Iterator<SimulateProcessorResult> expectedProcessorResultIterator =
66+
expectedSimulateDocumentVerboseResult.getProcessorResults().iterator();
6467
for (SimulateProcessorResult simulateProcessorResult : simulateDocumentVerboseResult.getProcessorResults()) {
6568
SimulateProcessorResult expectedProcessorResult = expectedProcessorResultIterator.next();
6669
assertThat(simulateProcessorResult.getProcessorTag(), equalTo(expectedProcessorResult.getProcessorTag()));
@@ -80,7 +83,8 @@ public void testSerialization() throws IOException {
8083
assertThat(result, instanceOf(SimulateDocumentBaseResult.class));
8184
SimulateDocumentBaseResult simulateDocumentBaseResult = (SimulateDocumentBaseResult) result;
8285
if (simulateDocumentBaseResult.getIngestDocument() != null) {
83-
assertIngestDocument(simulateDocumentBaseResult.getIngestDocument(), expectedSimulateDocumentBaseResult.getIngestDocument());
86+
assertIngestDocument(simulateDocumentBaseResult.getIngestDocument(),
87+
expectedSimulateDocumentBaseResult.getIngestDocument());
8488
}
8589
if (expectedSimulateDocumentBaseResult.getFailure() == null) {
8690
assertThat(simulateDocumentBaseResult.getFailure(), nullValue());
@@ -181,8 +185,8 @@ public void testFromXContentWithFailures() throws IOException {
181185
Supplier<SimulatePipelineResponse> instanceSupplier = SimulatePipelineResponseTests::createTestInstanceWithFailures;
182186
//exceptions are not of the same type whenever parsed back
183187
boolean assertToXContentEquivalence = false;
184-
AbstractXContentTestCase.testFromXContent(NUMBER_OF_TEST_RUNS, instanceSupplier, supportsUnknownFields(), getShuffleFieldsExceptions(),
185-
getRandomFieldsExcludeFilter(), this::createParser, this::doParseInstance,
186-
this::assertEqualInstances, assertToXContentEquivalence, getToXContentParams());
188+
AbstractXContentTestCase.testFromXContent(NUMBER_OF_TEST_RUNS, instanceSupplier, supportsUnknownFields(),
189+
getShuffleFieldsExceptions(), getRandomFieldsExcludeFilter(), this::createParser, this::doParseInstance,
190+
this::assertEqualInstances, assertToXContentEquivalence, getToXContentParams());
187191
}
188192
}

0 commit comments

Comments
 (0)