More 9 work

Author: niemyjski

src/Foundatio.Parsers.ElasticQueries/ElasticMappingResolver.cs

@@ -502,7 +502,7 @@ public static ElasticMappingResolver Create<T>(Func<TypeMappingDescriptor<T>, Ty
             logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));
 
             // use first returned mapping because index could have been an index alias
-            var mapping = response.Mappings.FirstOrDefault().Value?.Mappings;
+            var mapping = response.Mappings.Values.FirstOrDefault()?.Mappings;
             return mapping;
         }, logger);
     }
@@ -518,7 +518,7 @@ public static ElasticMappingResolver Create<T>(Func<TypeMappingDescriptor<T>, Ty
             logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));
 
             // use first returned mapping because index could have been an index alias
-            var mapping = response.Mappings.FirstOrDefault().Value?.Mappings;
+            var mapping = response.Mappings.Values.FirstOrDefault()?.Mappings;
             return mapping;
         }, logger);
     }
@@ -540,7 +540,7 @@ public static ElasticMappingResolver Create<T>(ElasticsearchClient client, ILogg
         logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));
 
         // use first returned mapping because index could have been an index alias
-        var mapping = response.Mappings.FirstOrDefault().Value?.Mappings;
+        var mapping = response.Mappings.Values.FirstOrDefault()?.Mappings;
         return mapping;
     }, client.Infer, logger);
 }
@@ -556,7 +556,7 @@ public static ElasticMappingResolver Create(ElasticsearchClient client, string i
             logger.LogTrace("GetMapping: {Request}", response.GetRequest(false, true));
 
             // use first returned mapping because index could have been an index alias
-            var mapping = response.Mappings.FirstOrDefault().Value?.Mappings;
+            var mapping = response.Mappings.Values.FirstOrDefault()?.Mappings;
             return mapping;
         }, client.Infer, logger);
     }

tests/Foundatio.Parsers.ElasticQueries.Tests/Utility/ElasticsearchTestBase.cs

@@ -105,7 +105,7 @@ public async Task CreateNamedIndexAsync<T>(string index, Func<TypeMappingDescrip
         configureMappings ??= m => m.Dynamic(DynamicMapping.True);
         configureIndex ??= i => i.NumberOfReplicas(0).Analysis(a => a.AddSortNormalizer());
 
-        await CreateIndexAsync(index, i => i.Settings(configureIndex(new IndexSettingsDescriptor())).Mappings(configureMappings));
+        await CreateIndexAsync(index, i => i.Settings(configureIndex(new IndexSettingsDescriptor())).Mappings<T>(configureMappings));
         Client.ElasticsearchClientSettings.DefaultIndices[typeof(T)] = index;
     }
 
@@ -115,7 +115,7 @@ public async Task<string> CreateRandomIndexAsync<T>(Func<TypeMappingDescriptor<T
         configureMappings ??= m => m.Dynamic(DynamicMapping.True);
         configureIndex ??= i => i.NumberOfReplicas(0).Analysis(a => a.AddSortNormalizer());
 
-        await CreateIndexAsync(index, i => i.Settings(configureIndex(new IndexSettingsDescriptor())).Mappings(configureMappings));
+        await CreateIndexAsync(index, i => i.Settings(configureIndex(new IndexSettingsDescriptor())).Mappings<T>(configureMappings));
         Client.ElasticsearchClientSettings.DefaultIndices[typeof(T)] = index;
 
         return index;