Skip to content

Commit 05c5529

Browse files
jasontedorjasontedor
committed
Clean up a few instances of "MetaData"
We recently cleaned up the use of the word "metadata" across the codebase. A few additional uses have trickled in, likely from in-progress work. This commit cleans up these last few instances. Relates #54519
1 parent 2a94672 commit 05c5529

File tree

9 files changed

+40
-40
lines changed

9 files changed

+40
-40
lines changed

‎server/src/main/java/org/elasticsearch/action/admin/indices/datastream/CreateDataStreamAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ public static class TransportAction extends TransportMasterNodeAction<Request, A
124124
@Inject
125125
public TransportAction(TransportService transportService, ClusterService clusterService, ThreadPool threadPool,
126126
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver,
127-
MetadataCreateIndexService metaDataCreateIndexService) {
127+
MetadataCreateIndexService metadataCreateIndexService) {
128128
super(NAME, transportService, clusterService, threadPool, actionFilters, Request::new, indexNameExpressionResolver);
129-
this.metadataCreateIndexService = metaDataCreateIndexService;
129+
this.metadataCreateIndexService = metadataCreateIndexService;
130130
}
131131

132132
@Override

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ public static <T extends AbstractPercentilesAggregationBuilder<T>> ConstructingO
135135
}
136136

137137
AbstractPercentilesAggregationBuilder(AbstractPercentilesAggregationBuilder<T> clone,
138-
AggregatorFactories.Builder factoriesBuilder, Map<String, Object> metaData) {
139-
super(clone, factoriesBuilder, metaData);
138+
AggregatorFactories.Builder factoriesBuilder, Map<String, Object> metadata) {
139+
super(clone, factoriesBuilder, metadata);
140140
this.percentilesConfig = clone.percentilesConfig;
141141
this.keyed = clone.keyed;
142142
this.values = clone.values;

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksAggregationBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ public PercentileRanksAggregationBuilder(StreamInput in) throws IOException {
6565

6666
private PercentileRanksAggregationBuilder(PercentileRanksAggregationBuilder clone,
6767
Builder factoriesBuilder,
68-
Map<String, Object> metaData) {
69-
super(clone, factoriesBuilder, metaData);
68+
Map<String, Object> metadata) {
69+
super(clone, factoriesBuilder, metadata);
7070
}
7171

7272
@Override
73-
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) {
74-
return new PercentileRanksAggregationBuilder(this, factoriesBuilder, metaData);
73+
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
74+
return new PercentileRanksAggregationBuilder(this, factoriesBuilder, metadata);
7575
}
7676

7777
/**

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksAggregatorFactory.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class PercentileRanksAggregatorFactory extends ValuesSourceAggregatorFactory<Val
4747
QueryShardContext queryShardContext,
4848
AggregatorFactory parent,
4949
AggregatorFactories.Builder subFactoriesBuilder,
50-
Map<String, Object> metaData) throws IOException {
51-
super(name, config, queryShardContext, parent, subFactoriesBuilder, metaData);
50+
Map<String, Object> metadata) throws IOException {
51+
super(name, config, queryShardContext, parent, subFactoriesBuilder, metadata);
5252
this.percents = percents;
5353
this.percentilesConfig = percentilesConfig;
5454
this.keyed = keyed;
@@ -58,10 +58,10 @@ class PercentileRanksAggregatorFactory extends ValuesSourceAggregatorFactory<Val
5858
protected Aggregator createUnmapped(SearchContext searchContext,
5959
Aggregator parent,
6060
List<PipelineAggregator> pipelineAggregators,
61-
Map<String, Object> metaData) throws IOException {
61+
Map<String, Object> metadata) throws IOException {
6262

6363
return percentilesConfig.createPercentileRanksAggregator(name, null, searchContext, parent, percents, keyed,
64-
config.format(), pipelineAggregators, metaData);
64+
config.format(), pipelineAggregators, metadata);
6565
}
6666

6767
@Override
@@ -70,8 +70,8 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource,
7070
Aggregator parent,
7171
boolean collectsFromSingleBucket,
7272
List<PipelineAggregator> pipelineAggregators,
73-
Map<String, Object> metaData) throws IOException {
73+
Map<String, Object> metadata) throws IOException {
7474
return percentilesConfig.createPercentileRanksAggregator(name, valuesSource, searchContext, parent, percents, keyed,
75-
config.format(), pipelineAggregators, metaData);
75+
config.format(), pipelineAggregators, metadata);
7676
}
7777
}

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregationBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ public PercentilesAggregationBuilder(String name, double[] values, PercentilesCo
7474
}
7575

7676
protected PercentilesAggregationBuilder(PercentilesAggregationBuilder clone,
77-
Builder factoriesBuilder, Map<String, Object> metaData) {
78-
super(clone, factoriesBuilder, metaData);
77+
Builder factoriesBuilder, Map<String, Object> metadata) {
78+
super(clone, factoriesBuilder, metadata);
7979
}
8080

8181
@Override
82-
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) {
83-
return new PercentilesAggregationBuilder(this, factoriesBuilder, metaData);
82+
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
83+
return new PercentilesAggregationBuilder(this, factoriesBuilder, metadata);
8484
}
8585

8686
/**

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregatorFactory.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class PercentilesAggregatorFactory extends ValuesSourceAggregatorFactory<ValuesS
4646
PercentilesAggregatorFactory(String name, ValuesSourceConfig<ValuesSource> config, double[] percents,
4747
PercentilesConfig percentilesConfig, boolean keyed, QueryShardContext queryShardContext,
4848
AggregatorFactory parent, AggregatorFactories.Builder subFactoriesBuilder,
49-
Map<String, Object> metaData) throws IOException {
50-
super(name, config, queryShardContext, parent, subFactoriesBuilder, metaData);
49+
Map<String, Object> metadata) throws IOException {
50+
super(name, config, queryShardContext, parent, subFactoriesBuilder, metadata);
5151
this.percents = percents;
5252
this.percentilesConfig = percentilesConfig;
5353
this.keyed = keyed;
@@ -57,10 +57,10 @@ class PercentilesAggregatorFactory extends ValuesSourceAggregatorFactory<ValuesS
5757
protected Aggregator createUnmapped(SearchContext searchContext,
5858
Aggregator parent,
5959
List<PipelineAggregator> pipelineAggregators,
60-
Map<String, Object> metaData) throws IOException {
60+
Map<String, Object> metadata) throws IOException {
6161

6262
return percentilesConfig.createPercentilesAggregator(name, null, searchContext, parent, percents, keyed,
63-
config.format(), pipelineAggregators, metaData);
63+
config.format(), pipelineAggregators, metadata);
6464
}
6565

6666
@Override
@@ -69,9 +69,9 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource,
6969
Aggregator parent,
7070
boolean collectsFromSingleBucket,
7171
List<PipelineAggregator> pipelineAggregators,
72-
Map<String, Object> metaData) throws IOException {
72+
Map<String, Object> metadata) throws IOException {
7373

7474
return percentilesConfig.createPercentilesAggregator(name, valuesSource, searchContext, parent, percents, keyed,
75-
config.format(), pipelineAggregators, metaData);
75+
config.format(), pipelineAggregators, metadata);
7676
}
7777
}

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesConfig.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ public PercentilesMethod getMethod() {
7272
abstract Aggregator createPercentilesAggregator(String name, ValuesSource valuesSource, SearchContext context, Aggregator parent,
7373
double[] values, boolean keyed, DocValueFormat formatter,
7474
List<PipelineAggregator> pipelineAggregators,
75-
Map<String, Object> metaData) throws IOException;
75+
Map<String, Object> metadata) throws IOException;
7676

7777
abstract Aggregator createPercentileRanksAggregator(String name, ValuesSource valuesSource, SearchContext context,
7878
Aggregator parent, double[] values, boolean keyed,
7979
DocValueFormat formatter, List<PipelineAggregator> pipelineAggregators,
80-
Map<String, Object> metaData) throws IOException;
80+
Map<String, Object> metadata) throws IOException;
8181

8282
@Override
8383
public void writeTo(StreamOutput out) throws IOException {
@@ -131,18 +131,18 @@ public double getCompression() {
131131
Aggregator createPercentilesAggregator(String name, ValuesSource valuesSource, SearchContext context, Aggregator parent,
132132
double[] values, boolean keyed, DocValueFormat formatter,
133133
List<PipelineAggregator> pipelineAggregators,
134-
Map<String, Object> metaData) throws IOException {
134+
Map<String, Object> metadata) throws IOException {
135135
return new TDigestPercentilesAggregator(name, valuesSource, context, parent, values, compression, keyed, formatter,
136-
pipelineAggregators, metaData);
136+
pipelineAggregators, metadata);
137137
}
138138

139139
@Override
140140
Aggregator createPercentileRanksAggregator(String name, ValuesSource valuesSource, SearchContext context, Aggregator parent,
141141
double[] values, boolean keyed, DocValueFormat formatter,
142142
List<PipelineAggregator> pipelineAggregators,
143-
Map<String, Object> metaData) throws IOException {
143+
Map<String, Object> metadata) throws IOException {
144144
return new TDigestPercentileRanksAggregator(name, valuesSource, context, parent, values, compression, keyed,
145-
formatter, pipelineAggregators, metaData);
145+
formatter, pipelineAggregators, metadata);
146146
}
147147

148148
@Override
@@ -207,18 +207,18 @@ public int getNumberOfSignificantValueDigits() {
207207
Aggregator createPercentilesAggregator(String name, ValuesSource valuesSource, SearchContext context, Aggregator parent,
208208
double[] values, boolean keyed, DocValueFormat formatter,
209209
List<PipelineAggregator> pipelineAggregators,
210-
Map<String, Object> metaData) throws IOException {
210+
Map<String, Object> metadata) throws IOException {
211211
return new HDRPercentilesAggregator(name, valuesSource, context, parent, values, numberOfSignificantValueDigits, keyed,
212-
formatter, pipelineAggregators, metaData);
212+
formatter, pipelineAggregators, metadata);
213213
}
214214

215215
@Override
216216
Aggregator createPercentileRanksAggregator(String name, ValuesSource valuesSource, SearchContext context, Aggregator parent,
217217
double[] values, boolean keyed, DocValueFormat formatter,
218218
List<PipelineAggregator> pipelineAggregators,
219-
Map<String, Object> metaData) throws IOException {
219+
Map<String, Object> metadata) throws IOException {
220220
return new HDRPercentileRanksAggregator(name, valuesSource, context, parent, values, numberOfSignificantValueDigits, keyed,
221-
formatter, pipelineAggregators, metaData);
221+
formatter, pipelineAggregators, metadata);
222222
}
223223

224224
@Override

‎server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@
4646
public class InternalPercentilesBucketTests extends InternalAggregationTestCase<InternalPercentilesBucket> {
4747

4848
@Override
49-
protected InternalPercentilesBucket createTestInstance(String name, Map<String, Object> metaData) {
50-
return createTestInstance(name, metaData, randomPercents(), true);
49+
protected InternalPercentilesBucket createTestInstance(String name, Map<String, Object> metadata) {
50+
return createTestInstance(name, metadata, randomPercents(), true);
5151
}
5252

53-
private static InternalPercentilesBucket createTestInstance(String name, Map<String, Object> metaData,
53+
private static InternalPercentilesBucket createTestInstance(String name, Map<String, Object> metadata,
5454
double[] percents, boolean keyed) {
5555
final double[] percentiles = new double[percents.length];
5656
for (int i = 0; i < percents.length; ++i) {
5757
percentiles[i] = frequently() ? randomDouble() : Double.NaN;
5858
}
59-
return createTestInstance(name, metaData, percents, percentiles, keyed);
59+
return createTestInstance(name, metadata, percents, percentiles, keyed);
6060
}
6161

6262
private static InternalPercentilesBucket createTestInstance(String name, Map<String, Object> metadata,

‎test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ private T createTestInstance(String name) {
353353
/** Return an instance on an unmapped field. */
354354
protected final T createUnmappedInstance(String name) {
355355
Map<String, Object> metadata = new HashMap<>();
356-
int metaDataCount = randomBoolean() ? 0 : between(1, 10);
357-
while (metadata.size() < metaDataCount) {
356+
int metadataCount = randomBoolean() ? 0 : between(1, 10);
357+
while (metadata.size() < metadataCount) {
358358
metadata.put(randomAlphaOfLength(5), randomAlphaOfLength(5));
359359
}
360360
return createUnmappedInstance(name, metadata);

0 commit comments

Comments
 (0)