SCMOD-3536: Updated dependency versions

Author: dermot-hardy

elastic-mapping-updater/src/main/java/com/github/cafdataprocessing/elastic/tools/ElasticMappingUpdater.java

@@ -30,8 +30,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.client.indices.GetIndexResponse;
-import org.elasticsearch.client.indices.IndexTemplateMetaData;
-import org.elasticsearch.cluster.metadata.MappingMetaData;
+import org.elasticsearch.client.indices.IndexTemplateMetadata;
+import org.elasticsearch.cluster.metadata.MappingMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -135,23 +135,23 @@ private ElasticMappingUpdater(
     private void updateIndexes()
         throws IOException, GetIndexException, GetTemplatesException, UnexpectedResponseException
     {
-        final List<IndexTemplateMetaData> templates = elasticRequestHandler.getTemplates();
+        final List<IndexTemplateMetadata> templates = elasticRequestHandler.getTemplates();
         LOGGER.info("Templates found in Elasticsearch: {}",
                     templates.stream().map(template -> template.name()).collect(Collectors.toList()));
-        for (final IndexTemplateMetaData template : templates) {
+        for (final IndexTemplateMetadata template : templates) {
             updateIndexesForTemplate(template);
         }
     }
 
-    private void updateIndexesForTemplate(final IndexTemplateMetaData template)
+    private void updateIndexesForTemplate(final IndexTemplateMetadata template)
         throws IOException, GetIndexException, GetTemplatesException, UnexpectedResponseException
     {
         final String templateName = template.name();
         LOGGER.info("---- Analyzing indexes matching template '{}' ----", templateName);
 
         final List<String> patterns = template.patterns();
 
-        final MappingMetaData mapping = template.mappings();
+        final MappingMetadata mapping = template.mappings();
         if (mapping == null) {
             LOGGER.info("No mappings in template '{}'. Indexes for this template will not be updated.", templateName);
             return;
@@ -168,7 +168,7 @@ private void updateIndexesForTemplate(final IndexTemplateMetaData template)
         LOGGER.info("Found {} index(es) that match template '{}'", indexes.size(), templateName);
         for (final String indexName : indexes) {
             GetIndexResponse getIndexResponse = elasticRequestHandler.getIndex(indexName);
-            MappingMetaData indexMappings = getIndexResponse.getMappings().get(indexName);
+            MappingMetadata indexMappings = getIndexResponse.getMappings().get(indexName);
             Map<String, Object> indexTypeMappings = indexMappings.getSourceAsMap();
 
             LOGGER.info("Comparing index mapping for '{}'", indexName);

elastic-mapping-updater/src/main/java/com/github/cafdataprocessing/elastic/tools/ElasticRequestHandler.java

@@ -33,7 +33,7 @@
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.indices.GetIndexResponse;
 import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
-import org.elasticsearch.client.indices.IndexTemplateMetaData;
+import org.elasticsearch.client.indices.IndexTemplateMetadata;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -60,7 +60,7 @@ public ElasticRequestHandler(final ElasticMappingUpdaterConfiguration schemaUpda
         this.elasticClient = ElasticProvider.getClient(schemaUpdaterConfig.getElasticSettings());
     }
 
-    List<IndexTemplateMetaData> getTemplates()
+    List<IndexTemplateMetadata> getTemplates()
         throws IOException, GetTemplatesException
     {
         LOGGER.debug("Getting templates...");
@@ -73,7 +73,7 @@ List<IndexTemplateMetaData> getTemplates()
                  final XContentParser parser
                  = XContentFactory.xContent(XContentType.JSON).createParser(NamedXContentRegistry.EMPTY, null, resultJsonStream)) {
                 final GetIndexTemplatesResponse getTemplatesResponse = GetIndexTemplatesResponse.fromXContent(parser);
-                final List<IndexTemplateMetaData> templates = getTemplatesResponse.getIndexTemplates();
+                final List<IndexTemplateMetadata> templates = getTemplatesResponse.getIndexTemplates();
                 return templates;
             }
         } else {

elastic-mapping-updater/src/test/java/com/github/cafdataprocessing/elastic/tools/test/ElasticMappingUpdaterIT.java

@@ -43,7 +43,7 @@
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.client.indices.GetIndexResponse;
 import org.elasticsearch.client.indices.PutIndexTemplateRequest;
-import org.elasticsearch.cluster.metadata.MappingMetaData;
+import org.elasticsearch.cluster.metadata.MappingMetadata;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -1312,7 +1312,7 @@ private Map<String, Object> getIndexMapping(final String testName, final String
                  final XContentParser parser
                  = XContentFactory.xContent(XContentType.JSON).createParser(NamedXContentRegistry.EMPTY, null, resultJsonStream)) {
                 final GetIndexResponse getIndexResponse = GetIndexResponse.fromXContent(parser);
-                final MappingMetaData indexMappings = getIndexResponse.getMappings().get(indexName);
+                final MappingMetadata indexMappings = getIndexResponse.getMappings().get(indexName);
                 final Map<String, Object> indexTypeMappings = indexMappings.getSourceAsMap();
                 LOGGER.info("{}------Updated mapping for index '{}': {}", testName, indexName, indexTypeMappings);
                 return indexTypeMappings;