diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search')
11 files changed, 19 insertions, 19 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java index 6898631f47..015fc76cda 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java @@ -68,7 +68,7 @@ public class ScriptHeuristic extends SignificanceHeuristic { * Read from a stream. */ public ScriptHeuristic(StreamInput in) throws IOException { - this(Script.readScript(in)); + this(new Script(in)); } @Override diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java index 3a516c690e..2c09d58afd 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java @@ -121,7 +121,7 @@ public class InternalScriptedMetric extends InternalMetricsAggregation implement @Override protected void doReadFrom(StreamInput in) throws IOException { if (in.readBoolean()) { - reduceScript = Script.readScript(in); + reduceScript = new Script(in); } aggregation = in.readGenericValue(); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorBuilder.java index 660bf7949e..753052b4fe 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorBuilder.java @@ -67,10 +67,10 @@ public class ScriptedMetricAggregatorBuilder extends AggregatorBuilder<ScriptedM */ public ScriptedMetricAggregatorBuilder(StreamInput in) throws IOException { super(in, InternalScriptedMetric.TYPE); - initScript = in.readOptionalStreamable(Script.SUPPLIER); - mapScript = in.readOptionalStreamable(Script.SUPPLIER); - combineScript = in.readOptionalStreamable(Script.SUPPLIER); - reduceScript = in.readOptionalStreamable(Script.SUPPLIER); + initScript = in.readOptionalWriteable(Script::new); + mapScript = in.readOptionalWriteable(Script::new); + combineScript = in.readOptionalWriteable(Script::new); + reduceScript = in.readOptionalWriteable(Script::new); if (in.readBoolean()) { params = in.readMap(); } @@ -78,10 +78,10 @@ public class ScriptedMetricAggregatorBuilder extends AggregatorBuilder<ScriptedM @Override protected void doWriteTo(StreamOutput out) throws IOException { - out.writeOptionalStreamable(initScript); - out.writeOptionalStreamable(mapScript); - out.writeOptionalStreamable(combineScript); - out.writeOptionalStreamable(reduceScript); + out.writeOptionalWriteable(initScript); + out.writeOptionalWriteable(mapScript); + out.writeOptionalWriteable(combineScript); + out.writeOptionalWriteable(reduceScript); boolean hasParams = params != null; out.writeBoolean(hasParams); if (hasParams) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java index f8271655e2..62ba540d2e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java @@ -147,7 +147,7 @@ public class BucketScriptPipelineAggregator extends PipelineAggregator { @SuppressWarnings("unchecked") @Override protected void doReadFrom(StreamInput in) throws IOException { - script = Script.readScript(in); + script = new Script(in); formatter = in.readNamedWriteable(DocValueFormat.class); gapPolicy = GapPolicy.readFrom(in); bucketsPathsMap = (Map<String, String>) in.readGenericValue(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregatorBuilder.java index 773eb372dc..6e266b92f6 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregatorBuilder.java @@ -76,7 +76,7 @@ public class BucketScriptPipelineAggregatorBuilder extends PipelineAggregatorBui for (int i = 0; i < mapSize; i++) { bucketsPathsMap.put(in.readString(), in.readString()); } - script = Script.readScript(in); + script = new Script(in); format = in.readOptionalString(); gapPolicy = GapPolicy.readFrom(in); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java index a2dfdca669..7759d9ddc9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java @@ -129,7 +129,7 @@ public class BucketSelectorPipelineAggregator extends PipelineAggregator { @SuppressWarnings("unchecked") @Override protected void doReadFrom(StreamInput in) throws IOException { - script = Script.readScript(in); + script = new Script(in); gapPolicy = GapPolicy.readFrom(in); bucketsPathsMap = (Map<String, String>) in.readGenericValue(); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregatorBuilder.java index aa9b41d42b..f109e1c61e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregatorBuilder.java @@ -73,7 +73,7 @@ public class BucketSelectorPipelineAggregatorBuilder extends PipelineAggregatorB for (int i = 0; i < mapSize; i++) { bucketsPathsMap.put(in.readString(), in.readString()); } - script = Script.readScript(in); + script = new Script(in); gapPolicy = GapPolicy.readFrom(in); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorBuilder.java index ee2b0a3540..fb07854ecb 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorBuilder.java @@ -126,7 +126,7 @@ public abstract class ValuesSourceAggregatorBuilder<VS extends ValuesSource, AB private void read(StreamInput in) throws IOException { field = in.readOptionalString(); if (in.readBoolean()) { - script = Script.readScript(in); + script = new Script(in); } if (in.readBoolean()) { valueType = ValueType.readFromStream(in); diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index e02b508f88..5f01f0a994 100644 --- a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -1281,7 +1281,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ */ public ScriptField(StreamInput in) throws IOException { fieldName = in.readString(); - script = Script.readScript(in); + script = new Script(in); ignoreFailure = in.readBoolean(); } diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java b/core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java index d8bde6b9f4..8c5a4686d3 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java +++ b/core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java @@ -183,7 +183,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest { types = in.readStringArray(); filteringAliases = in.readStringArray(); nowInMillis = in.readVLong(); - template = in.readOptionalStreamable(Template::new); + template = in.readOptionalWriteable(Template::new); requestCache = in.readOptionalBoolean(); } @@ -212,7 +212,7 @@ public class ShardSearchLocalRequest implements ShardSearchRequest { out.writeVLong(nowInMillis); } - out.writeOptionalStreamable(template); + out.writeOptionalWriteable(template); out.writeOptionalBoolean(requestCache); } diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java index 5c58d10b67..bc7838532c 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java @@ -113,7 +113,7 @@ public class ScriptSortBuilder extends SortBuilder<ScriptSortBuilder> { * Read from a stream. */ public ScriptSortBuilder(StreamInput in) throws IOException { - script = Script.readScript(in); + script = new Script(in); type = ScriptSortType.readFromStream(in); order = SortOrder.readFromStream(in); sortMode = in.readOptionalWriteable(SortMode::readFromStream); |