From a6c0a813b5b820f81cd89e7e7f3c2be7135832f8 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 20 Apr 2016 16:57:56 -0400 Subject: [PATCH] Remove readFrom from ingest It isn't needed and will be removed from the interface declaring it. Relates to #17085 --- .../ingest/SimulateProcessorResult.java | 54 +++++++-------- .../org/elasticsearch/ingest/IngestStats.java | 69 +++++++++---------- .../ingest/PipelineConfiguration.java | 4 +- .../elasticsearch/ingest/core/IngestInfo.java | 40 +++++------ .../ingest/core/ProcessorInfo.java | 23 +++---- .../ingest/IngestStatsTests.java | 7 +- 6 files changed, 90 insertions(+), 107 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java index 6a38434d4c0..ad915eaadab 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java @@ -34,17 +34,6 @@ public class SimulateProcessorResult implements Writeable, ToXContent { private final Stats totalStats; private final Map statsPerPipeline; + public IngestStats(Stats totalStats, Map statsPerPipeline) { + this.totalStats = totalStats; + this.statsPerPipeline = statsPerPipeline; + } + + /** + * Read from a stream. + */ public IngestStats(StreamInput in) throws IOException { this.totalStats = new Stats(in); int size = in.readVInt(); @@ -43,11 +51,17 @@ public class IngestStats implements Writeable, ToXContent { } } - public IngestStats(Stats totalStats, Map statsPerPipeline) { - this.totalStats = totalStats; - this.statsPerPipeline = statsPerPipeline; + @Override + public void writeTo(StreamOutput out) throws IOException { + totalStats.writeTo(out); + out.writeVLong(statsPerPipeline.size()); + for (Map.Entry entry : statsPerPipeline.entrySet()) { + out.writeString(entry.getKey()); + entry.getValue().writeTo(out); + } } + /** * @return The accumulated stats for all pipelines */ @@ -62,21 +76,6 @@ public class IngestStats implements Writeable, ToXContent { return statsPerPipeline; } - @Override - public IngestStats readFrom(StreamInput in) throws IOException { - return new IngestStats(in); - } - - @Override - public void writeTo(StreamOutput out) throws IOException { - totalStats.writeTo(out); - out.writeVLong(statsPerPipeline.size()); - for (Map.Entry entry : statsPerPipeline.entrySet()) { - out.writeString(entry.getKey()); - entry.getValue().writeTo(out); - } - } - @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject("ingest"); @@ -101,6 +100,16 @@ public class IngestStats implements Writeable, ToXContent { private final long ingestCurrent; private final long ingestFailedCount; + public Stats(long ingestCount, long ingestTimeInMillis, long ingestCurrent, long ingestFailedCount) { + this.ingestCount = ingestCount; + this.ingestTimeInMillis = ingestTimeInMillis; + this.ingestCurrent = ingestCurrent; + this.ingestFailedCount = ingestFailedCount; + } + + /** + * Read from a stream. + */ public Stats(StreamInput in) throws IOException { ingestCount = in.readVLong(); ingestTimeInMillis = in.readVLong(); @@ -108,11 +117,12 @@ public class IngestStats implements Writeable, ToXContent { ingestFailedCount = in.readVLong(); } - public Stats(long ingestCount, long ingestTimeInMillis, long ingestCurrent, long ingestFailedCount) { - this.ingestCount = ingestCount; - this.ingestTimeInMillis = ingestTimeInMillis; - this.ingestCurrent = ingestCurrent; - this.ingestFailedCount = ingestFailedCount; + @Override + public void writeTo(StreamOutput out) throws IOException { + out.writeVLong(ingestCount); + out.writeVLong(ingestTimeInMillis); + out.writeVLong(ingestCurrent); + out.writeVLong(ingestFailedCount); } /** @@ -144,19 +154,6 @@ public class IngestStats implements Writeable, ToXContent { return ingestFailedCount; } - @Override - public Stats readFrom(StreamInput in) throws IOException { - return new Stats(in); - } - - @Override - public void writeTo(StreamOutput out) throws IOException { - out.writeVLong(ingestCount); - out.writeVLong(ingestTimeInMillis); - out.writeVLong(ingestCurrent); - out.writeVLong(ingestFailedCount); - } - @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.field("count", ingestCount); diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java index 6272eee1cbf..a6bff3ff5cb 100644 --- a/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java +++ b/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java @@ -25,7 +25,6 @@ import org.elasticsearch.common.ParseFieldMatcherSupplier; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -39,8 +38,7 @@ import java.util.function.BiFunction; /** * Encapsulates a pipeline's id and configuration as a blob */ -public final class PipelineConfiguration extends AbstractDiffable - implements Writeable, ToXContent { +public final class PipelineConfiguration extends AbstractDiffable implements ToXContent { final static PipelineConfiguration PROTOTYPE = new PipelineConfiguration(null, null); diff --git a/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java b/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java index d128732203f..efa425c9497 100644 --- a/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java +++ b/core/src/main/java/org/elasticsearch/ingest/core/IngestInfo.java @@ -21,15 +21,11 @@ package org.elasticsearch.ingest.core; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -39,29 +35,19 @@ public class IngestInfo implements Writeable, ToXContent { private final Set processors; - public IngestInfo(StreamInput in) throws IOException { - this(Collections.emptyList()); - final int size = in.readVInt(); - for (int i = 0; i < size; i++) { - processors.add(new ProcessorInfo(in)); - } - } - public IngestInfo(List processors) { this.processors = new TreeSet<>(processors); // we use a treeset here to have a test-able / predictable order } - public Iterable getProcessors() { - return processors; - } - - public boolean containsProcessor(String type) { - return processors.contains(new ProcessorInfo(type)); - } - - @Override - public IngestInfo readFrom(StreamInput in) throws IOException { - return new IngestInfo(in); + /** + * Read from a stream. + */ + public IngestInfo(StreamInput in) throws IOException { + processors = new TreeSet<>(); + final int size = in.readVInt(); + for (int i = 0; i < size; i++) { + processors.add(new ProcessorInfo(in)); + } } @Override @@ -72,6 +58,14 @@ public class IngestInfo implements Writeable, ToXContent { } } + public Iterable getProcessors() { + return processors; + } + + public boolean containsProcessor(String type) { + return processors.contains(new ProcessorInfo(type)); + } + @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject("ingest"); diff --git a/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java b/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java index f652b182919..984123427d9 100644 --- a/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java +++ b/core/src/main/java/org/elasticsearch/ingest/core/ProcessorInfo.java @@ -21,7 +21,6 @@ package org.elasticsearch.ingest.core; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -32,12 +31,20 @@ public class ProcessorInfo implements Writeable, ToXContent, Comp private final String type; + public ProcessorInfo(String type) { + this.type = type; + } + + /** + * Read from a stream. + */ public ProcessorInfo(StreamInput input) throws IOException { type = input.readString(); } - public ProcessorInfo(String type) { - this.type = type; + @Override + public void writeTo(StreamOutput out) throws IOException { + out.writeString(this.type); } /** @@ -47,16 +54,6 @@ public class ProcessorInfo implements Writeable, ToXContent, Comp return type; } - @Override - public ProcessorInfo readFrom(StreamInput in) throws IOException { - return new ProcessorInfo(in); - } - - @Override - public void writeTo(StreamOutput out) throws IOException { - out.writeString(this.type); - } - @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java b/core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java index e7064b7e449..119e94580ad 100644 --- a/core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java +++ b/core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.ingest; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.test.ESTestCase; import java.io.IOException; @@ -60,10 +59,10 @@ public class IngestStatsTests extends ESTestCase { assertEquals(leftStats.getIngestCurrent(), rightStats.getIngestCurrent()); } - private T serialize(Writeable writeable) throws IOException { + private IngestStats serialize(IngestStats stats) throws IOException { BytesStreamOutput out = new BytesStreamOutput(); - writeable.writeTo(out); + stats.writeTo(out); StreamInput in = StreamInput.wrap(out.bytes()); - return writeable.readFrom(in); + return new IngestStats(in); } }