From 4588782709a1d5c2356545fb7cf5a8264aa1a2a7 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Thu, 4 Oct 2018 09:23:01 -0500 Subject: [PATCH] cosmetic changes --- .../java/org/elasticsearch/ingest/CompoundProcessor.java | 2 +- .../java/org/elasticsearch/ingest/ConditionalProcessor.java | 5 ++--- .../main/java/org/elasticsearch/ingest/IngestService.java | 2 +- .../src/main/java/org/elasticsearch/ingest/IngestStats.java | 2 +- .../action/admin/cluster/node/stats/NodeStatsTests.java | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java index 7c7b988fa5cdd..746da560f9b3d 100644 --- a/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java +++ b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java @@ -64,7 +64,7 @@ public CompoundProcessor(boolean ignoreFailure, List processors, List this.processors = processors; this.onFailureProcessors = onFailureProcessors; this.clock = clock; - processorsWithMetrics = new ArrayList<>(processors.size()); + this.processorsWithMetrics = new ArrayList<>(processors.size()); processors.forEach(p -> processorsWithMetrics.add(new Tuple<>(p, new IngestMetric()))); } diff --git a/server/src/main/java/org/elasticsearch/ingest/ConditionalProcessor.java b/server/src/main/java/org/elasticsearch/ingest/ConditionalProcessor.java index 4cf8be542b56f..50eb137da2c9d 100644 --- a/server/src/main/java/org/elasticsearch/ingest/ConditionalProcessor.java +++ b/server/src/main/java/org/elasticsearch/ingest/ConditionalProcessor.java @@ -29,7 +29,6 @@ import java.util.ListIterator; import java.util.Map; import java.util.Set; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.elasticsearch.script.IngestConditionalScript; import org.elasticsearch.script.Script; @@ -47,8 +46,8 @@ public class ConditionalProcessor extends AbstractProcessor { private final IngestMetric metric; private final Clock clock; - ConditionalProcessor(String tag, Script script, ScriptService scriptService, Processor processor) { - this(tag, script, scriptService, processor, Clock.systemUTC()); + ConditionalProcessor(String tag, Script script, ScriptService scriptService, Processor processor) { + this(tag, script, scriptService, processor, Clock.systemUTC()); } ConditionalProcessor(String tag, Script script, ScriptService scriptService, Processor processor, Clock clock) { diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestService.java b/server/src/main/java/org/elasticsearch/ingest/IngestService.java index 3e83f16daaaf0..e4e5e6e86aa53 100644 --- a/server/src/main/java/org/elasticsearch/ingest/IngestService.java +++ b/server/src/main/java/org/elasticsearch/ingest/IngestService.java @@ -270,7 +270,7 @@ public void applyClusterState(final ClusterChangedEvent event) { //Best attempt to populate new processor metrics using a parallel array of the old metrics. This is not ideal since //the per processor metrics may get reset when the arrays don't match. However, to get to an ideal model, unique and //consistent id's per processor and/or semantic equals for each processor will be needed. - if(newPerProcessMetrics.size() == oldPerProcessMetrics.size()) { + if (newPerProcessMetrics.size() == oldPerProcessMetrics.size()) { Iterator> oldMetricsIterator = oldPerProcessMetrics.iterator(); for (Tuple compositeMetric : newPerProcessMetrics) { String type = compositeMetric.v1().getType(); diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestStats.java b/server/src/main/java/org/elasticsearch/ingest/IngestStats.java index 435d4839853a6..bd38ee70a6b25 100644 --- a/server/src/main/java/org/elasticsearch/ingest/IngestStats.java +++ b/server/src/main/java/org/elasticsearch/ingest/IngestStats.java @@ -80,7 +80,7 @@ public void writeTo(StreamOutput out) throws IOException { pipelineStats.writeTo(out); List> processorStats = entry.getValue().v2(); out.writeVInt(processorStats.size()); - for(Tuple processorTuple : processorStats){ + for (Tuple processorTuple : processorStats) { String processorName = processorTuple.v1(); Stats processorStat = processorTuple.v2(); out.writeString(processorName); diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java index 999e58780c776..a865fabc48bdc 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java @@ -285,7 +285,7 @@ public void testSerialization() throws IOException { List> deserializedProcessorStats = deserializedIngestStats.getProcessorStatsForPipeline(pipelineName); Iterator> it = deserializedProcessorStats.iterator(); - for(Tuple processorTuple : processorStats){ + for (Tuple processorTuple : processorStats) { Tuple deserializedTuple = it.next(); assertEquals(processorTuple.v1(), deserializedTuple.v1()); IngestStats.Stats pStats = processorTuple.v2();