Skip to content

Commit beca981

Browse files
committed
Fix broken test related to index name casing
Deprecate Template query. Can't deprecate the query types as they are used in the phrase suggester.
1 parent f49982f commit beca981

File tree

4 files changed

+7
-23
lines changed

4 files changed

+7
-23
lines changed

src/Nest/CommonAbstractions/Infer/IndexName/IndexNameResolver.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ private static void ValidateIndexName(string indexName)
4141
if (string.IsNullOrWhiteSpace(indexName))
4242
throw new ArgumentException(
4343
"Index name is null for the given type and no default index is set. "
44-
+ "Map an index name using ConnectionSettings.MapDefaultTypeIndices() "
44+
+ "Map an index name using ConnectionSettings.MapDefaultTypeIndices(), ConnectionSettings.InferMappingFor<TDocument>() "
4545
+ "or set a default index using ConnectionSettings.DefaultIndex()."
4646
);
47-
4847
}
4948
}
5049
}

src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,11 @@ public QueryContainer Regexp(Func<RegexpQueryDescriptor<T>, IRegexpQuery> select
475475
public QueryContainer FunctionScore(Func<FunctionScoreQueryDescriptor<T>, IFunctionScoreQuery> selector) =>
476476
WrapInContainer(selector, (query, container) => container.FunctionScore = query);
477477

478+
/// <summary>
479+
/// A query that accepts a query template and a map of key/value pairs to fill in template parameters.
480+
/// Templating is based on Mustache.
481+
/// </summary>
482+
[Obsolete("Deprecated in 5.0.0. Use Search Template API instead")]
478483
public QueryContainer Template(Func<TemplateQueryDescriptor<T>, ITemplateQuery> selector) =>
479484
WrapInContainer(selector, (query, container) => container.Template = query);
480485

src/Nest/QueryDsl/Query.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ public static QueryContainer SpanWithin(Func<SpanWithinQueryDescriptor<T>, ISpan
168168
public static QueryContainer SpanFieldMasking(Func<SpanFieldMaskingQueryDescriptor<T>, ISpanFieldMaskingQuery> selector) =>
169169
new QueryContainerDescriptor<T>().SpanFieldMasking(selector);
170170

171+
[Obsolete("Deprecated in 5.0.0. Use Search Template API instead")]
171172
public static QueryContainer Template(Func<TemplateQueryDescriptor<T>, ITemplateQuery> selector) =>
172173
new QueryContainerDescriptor<T>().Template(selector);
173174

src/Tests/ClientConcepts/HighLevel/Inference/IndexNameInference.doc.cs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -99,27 +99,6 @@ [U] public void ExplicitIndexOnRequestTakesPrecedence()
9999
response.ApiCall.Uri.LocalPath.Should().StartWith("/some-other-index/");
100100
}
101101

102-
//hide
103-
[U] public void UppercaseCharacterThrowsArgumentException()
104-
{
105-
var settings = new ConnectionSettings()
106-
.DefaultIndex("Default")
107-
.MapDefaultTypeIndices(m => m
108-
.Add(typeof(Project), "myProjects")
109-
);
110-
111-
var resolver = new IndexNameResolver(settings);
112-
113-
var e = Assert.Throws<ArgumentException>(() => resolver.Resolve<Project>());
114-
e.Message.Should().Be($"Index names cannot contain uppercase characters: myProjects.");
115-
116-
e = Assert.Throws<ArgumentException>(() => resolver.Resolve<Tag>());
117-
e.Message.Should().Be($"Index names cannot contain uppercase characters: Default.");
118-
119-
e = Assert.Throws<ArgumentException>(() => resolver.Resolve("Foo"));
120-
e.Message.Should().Be($"Index names cannot contain uppercase characters: Foo.");
121-
}
122-
123102
//hide
124103
[U] public void NoIndexThrowsArgumentException()
125104
{

0 commit comments

Comments
 (0)