Rename MetaData to Metadata in all of the places (#54519)

This is a simple naming change PR, to fix the fact that "metadata" is a
single English word, and for too long we have not followed general
naming conventions for it. We are also not consistent about it, for
example, METADATA instead of META_DATA if we were trying to be
consistent with MetaData (although METADATA is correct when considered
in the context of "metadata"). This was a simple find and replace across
the code base, only taking a few minutes to fix this naming issue
forever.

Author: jasontedor

benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/AllocationBenchmark.java

@@ -21,8 +21,8 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
-import org.elasticsearch.cluster.metadata.MetaData;
+import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.routing.RoutingTable;
 import org.elasticsearch.cluster.routing.ShardRoutingState;
@@ -127,27 +127,27 @@ public void setUp() throws Exception {
             Settings.builder().put("cluster.routing.allocation.awareness.attributes", "tag").build()
         );
 
-        MetaData.Builder mb = MetaData.builder();
+        Metadata.Builder mb = Metadata.builder();
         for (int i = 1; i <= numIndices; i++) {
             mb.put(
-                IndexMetaData.builder("test_" + i)
+                IndexMetadata.builder("test_" + i)
                     .settings(Settings.builder().put("index.version.created", Version.CURRENT))
                     .numberOfShards(numShards)
                     .numberOfReplicas(numReplicas)
             );
         }
-        MetaData metaData = mb.build();
+        Metadata metadata = mb.build();
         RoutingTable.Builder rb = RoutingTable.builder();
         for (int i = 1; i <= numIndices; i++) {
-            rb.addAsNew(metaData.index("test_" + i));
+            rb.addAsNew(metadata.index("test_" + i));
         }
         RoutingTable routingTable = rb.build();
         DiscoveryNodes.Builder nb = DiscoveryNodes.builder();
         for (int i = 1; i <= numNodes; i++) {
             nb.add(Allocators.newNode("node" + i, Collections.singletonMap("tag", "tag_" + (i % numTags))));
         }
         initialClusterState = ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY))
-            .metaData(metaData)
+            .metadata(metadata)
             .routingTable(routingTable)
             .nodes(nb)
             .build();

client/benchmark/src/main/java/org/elasticsearch/client/benchmark/rest/RestClientBenchmark.java

@@ -63,18 +63,18 @@ protected SearchRequestExecutor searchRequestExecutor(RestClient client, String
 
     private static final class RestBulkRequestExecutor implements BulkRequestExecutor {
         private final RestClient client;
-        private final String actionMetaData;
+        private final String actionMetadata;
 
         RestBulkRequestExecutor(RestClient client, String index, String type) {
             this.client = client;
-            this.actionMetaData = String.format(Locale.ROOT, "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", index, type);
+            this.actionMetadata = String.format(Locale.ROOT, "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", index, type);
         }
 
         @Override
         public boolean bulkIndex(List<String> bulkData) {
             StringBuilder bulkRequestBody = new StringBuilder();
             for (String bulkItem : bulkData) {
-                bulkRequestBody.append(actionMetaData);
+                bulkRequestBody.append(actionMetadata);
                 bulkRequestBody.append(bulkItem);
                 bulkRequestBody.append("\n");
             }

client/rest-high-level/src/main/java/org/elasticsearch/client/GetAliasesResponse.java

@@ -20,7 +20,7 @@
 package org.elasticsearch.client;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.cluster.metadata.AliasMetaData;
+import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.elasticsearch.common.xcontent.StatusToXContentObject;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -52,9 +52,9 @@ public class GetAliasesResponse implements StatusToXContentObject {
     private final String error;
     private final ElasticsearchException exception;
 
-    private final Map<String, Set<AliasMetaData>> aliases;
+    private final Map<String, Set<AliasMetadata>> aliases;
 
-    GetAliasesResponse(RestStatus status, String error, Map<String, Set<AliasMetaData>> aliases) {
+    GetAliasesResponse(RestStatus status, String error, Map<String, Set<AliasMetadata>> aliases) {
         this.status = status;
         this.error = error;
         this.aliases = aliases;
@@ -90,7 +90,7 @@ public ElasticsearchException getException() {
     /**
      * Return the requested aliases
      */
-    public Map<String, Set<AliasMetaData>> getAliases() {
+    public Map<String, Set<AliasMetadata>> getAliases() {
         return aliases;
     }
 
@@ -103,13 +103,13 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 builder.field("status", status.getStatus());
             }
 
-            for (Map.Entry<String, Set<AliasMetaData>> entry : aliases.entrySet()) {
+            for (Map.Entry<String, Set<AliasMetadata>> entry : aliases.entrySet()) {
                 builder.startObject(entry.getKey());
                 {
                     builder.startObject("aliases");
                     {
-                        for (final AliasMetaData alias : entry.getValue()) {
-                            AliasMetaData.Builder.toXContent(alias, builder, ToXContent.EMPTY_PARAMS);
+                        for (final AliasMetadata alias : entry.getValue()) {
+                            AliasMetadata.Builder.toXContent(alias, builder, ToXContent.EMPTY_PARAMS);
                         }
                     }
                     builder.endObject();
@@ -129,7 +129,7 @@ public static GetAliasesResponse fromXContent(XContentParser parser) throws IOEx
             parser.nextToken();
         }
         ensureExpectedToken(Token.START_OBJECT, parser.currentToken(), parser::getTokenLocation);
-        Map<String, Set<AliasMetaData>> aliases = new HashMap<>();
+        Map<String, Set<AliasMetadata>> aliases = new HashMap<>();
 
         String currentFieldName;
         Token token;
@@ -159,7 +159,7 @@ public static GetAliasesResponse fromXContent(XContentParser parser) throws IOEx
                 } else {
                     String indexName = parser.currentName();
                     if (parser.nextToken() == Token.START_OBJECT) {
-                        Set<AliasMetaData> parseInside = parseAliases(parser);
+                        Set<AliasMetadata> parseInside = parseAliases(parser);
                         aliases.put(indexName, parseInside);
                     }
                 }
@@ -173,8 +173,8 @@ public static GetAliasesResponse fromXContent(XContentParser parser) throws IOEx
         return new GetAliasesResponse(status, error, aliases);
     }
 
-    private static Set<AliasMetaData> parseAliases(XContentParser parser) throws IOException {
-        Set<AliasMetaData> aliases = new HashSet<>();
+    private static Set<AliasMetadata> parseAliases(XContentParser parser) throws IOException {
+        Set<AliasMetadata> aliases = new HashSet<>();
         Token token;
         String currentFieldName = null;
         while ((token = parser.nextToken()) != Token.END_OBJECT) {
@@ -183,7 +183,7 @@ private static Set<AliasMetaData> parseAliases(XContentParser parser) throws IOE
             } else if (token == Token.START_OBJECT) {
                 if ("aliases".equals(currentFieldName)) {
                     while (parser.nextToken() != Token.END_OBJECT) {
-                        AliasMetaData fromXContent = AliasMetaData.Builder.fromXContent(parser);
+                        AliasMetadata fromXContent = AliasMetadata.Builder.fromXContent(parser);
                         aliases.add(fromXContent);
                     }
                 } else {

client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesRequestConverters.java

@@ -53,7 +53,7 @@
 import org.elasticsearch.client.indices.ResizeRequest;
 import org.elasticsearch.client.indices.UnfreezeIndexRequest;
 import org.elasticsearch.client.indices.rollover.RolloverRequest;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.Strings;
 
 import java.io.IOException;
@@ -238,7 +238,7 @@ static Request existsAlias(GetAliasesRequest getAliasesRequest) {
     }
 
     static Request split(ResizeRequest resizeRequest) throws IOException {
-        if (IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.exists(resizeRequest.getSettings()) == false) {
+        if (IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING.exists(resizeRequest.getSettings()) == false) {
             throw new IllegalArgumentException("index.number_of_shards is required for split operations");
         }
         return resize(resizeRequest, ResizeType.SPLIT);

client/rest-high-level/src/main/java/org/elasticsearch/client/analytics/StringStatsAggregationBuilder.java

@@ -101,7 +101,7 @@ protected ValuesSourceAggregatorFactory innerBuild(QueryShardContext queryShardC
     }
 
     @Override
-    protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) {
+    protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
         throw new UnsupportedOperationException();
     }
 

client/rest-high-level/src/main/java/org/elasticsearch/client/analytics/TopMetricsAggregationBuilder.java

@@ -106,7 +106,7 @@ protected AggregatorFactory doBuild(QueryShardContext queryShardContext, Aggrega
     }
 
     @Override
-    protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) {
+    protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
         throw new UnsupportedOperationException();
     }
 }

client/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetFieldMappingsResponse.java

@@ -43,43 +43,43 @@ public class GetFieldMappingsResponse {
 
     private static final ParseField MAPPINGS = new ParseField("mappings");
 
-    private static final ObjectParser<Map<String, FieldMappingMetaData>, String> PARSER =
+    private static final ObjectParser<Map<String, FieldMappingMetadata>, String> PARSER =
         new ObjectParser<>(MAPPINGS.getPreferredName(), true, HashMap::new);
 
     static {
         PARSER.declareField((p, fieldMappings, index) -> {
             p.nextToken();
             while (p.currentToken() == XContentParser.Token.FIELD_NAME) {
                 final String fieldName = p.currentName();
-                final FieldMappingMetaData fieldMappingMetaData = FieldMappingMetaData.fromXContent(p);
-                fieldMappings.put(fieldName, fieldMappingMetaData);
+                final FieldMappingMetadata fieldMappingMetadata = FieldMappingMetadata.fromXContent(p);
+                fieldMappings.put(fieldName, fieldMappingMetadata);
                 p.nextToken();
             }
         }, MAPPINGS, ObjectParser.ValueType.OBJECT);
     }
 
-    private Map<String, Map<String, FieldMappingMetaData>> mappings;
+    private Map<String, Map<String, FieldMappingMetadata>> mappings;
 
-    GetFieldMappingsResponse(Map<String, Map<String, FieldMappingMetaData>> mappings) {
+    GetFieldMappingsResponse(Map<String, Map<String, FieldMappingMetadata>> mappings) {
         this.mappings = mappings;
     }
 
 
      /**
      * Returns the fields mapping. The return map keys are indexes and fields (as specified in the request).
      */
-    public Map<String, Map<String, FieldMappingMetaData>> mappings() {
+    public Map<String, Map<String, FieldMappingMetadata>> mappings() {
         return mappings;
     }
 
     /**
      * Returns the mappings of a specific index and field.
      *
      * @param field field name as specified in the {@link GetFieldMappingsRequest}
-     * @return FieldMappingMetaData for the requested field or null if not found.
+     * @return FieldMappingMetadata for the requested field or null if not found.
      */
-    public FieldMappingMetaData fieldMappings(String index, String field) {
-        Map<String, FieldMappingMetaData> indexMapping = mappings.get(index);
+    public FieldMappingMetadata fieldMappings(String index, String field) {
+        Map<String, FieldMappingMetadata> indexMapping = mappings.get(index);
         if (indexMapping == null) {
             return null;
         }
@@ -89,25 +89,25 @@ public FieldMappingMetaData fieldMappings(String index, String field) {
 
     public static GetFieldMappingsResponse fromXContent(XContentParser parser) throws IOException {
         ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser::getTokenLocation);
-        final Map<String, Map<String, FieldMappingMetaData>> mappings = new HashMap<>();
+        final Map<String, Map<String, FieldMappingMetadata>> mappings = new HashMap<>();
         if (parser.nextToken() == XContentParser.Token.FIELD_NAME) {
             while (parser.currentToken() == XContentParser.Token.FIELD_NAME) {
                 final String index = parser.currentName();
-                final Map<String, FieldMappingMetaData> fieldMappings = PARSER.parse(parser, index);
+                final Map<String, FieldMappingMetadata> fieldMappings = PARSER.parse(parser, index);
                 mappings.put(index, fieldMappings);
                 parser.nextToken();
             }
         }
         return new GetFieldMappingsResponse(mappings);
     }
 
-    public static class FieldMappingMetaData {
+    public static class FieldMappingMetadata {
         private static final ParseField FULL_NAME = new ParseField("full_name");
         private static final ParseField MAPPING = new ParseField("mapping");
 
-        private static final ConstructingObjectParser<FieldMappingMetaData, String> PARSER =
+        private static final ConstructingObjectParser<FieldMappingMetadata, String> PARSER =
             new ConstructingObjectParser<>("field_mapping_meta_data", true,
-                a -> new FieldMappingMetaData((String)a[0], (BytesReference)a[1])
+                a -> new FieldMappingMetadata((String)a[0], (BytesReference)a[1])
             );
 
         static {
@@ -124,7 +124,7 @@ public static class FieldMappingMetaData {
         private String fullName;
         private BytesReference source;
 
-        public FieldMappingMetaData(String fullName, BytesReference source) {
+        public FieldMappingMetadata(String fullName, BytesReference source) {
             this.fullName = fullName;
             this.source = source;
         }
@@ -145,20 +145,20 @@ BytesReference getSource() {
             return source;
         }
 
-        public static FieldMappingMetaData fromXContent(XContentParser parser) throws IOException {
+        public static FieldMappingMetadata fromXContent(XContentParser parser) throws IOException {
             return PARSER.parse(parser, null);
         }
 
        @Override
         public String toString() {
-            return "FieldMappingMetaData{fullName='" + fullName + '\'' + ", source=" + source + '}';
+            return "FieldMappingMetadata{fullName='" + fullName + '\'' + ", source=" + source + '}';
         }
 
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
-            if (!(o instanceof FieldMappingMetaData)) return false;
-            FieldMappingMetaData that = (FieldMappingMetaData) o;
+            if (!(o instanceof FieldMappingMetadata)) return false;
+            FieldMappingMetadata that = (FieldMappingMetadata) o;
             return Objects.equals(fullName, that.fullName) && Objects.equals(source, that.source);
         }