Skip to content

Commit e2e402c

Browse files
authored
Merge branch '6.x' into 6.4
2 parents df209f9 + b2bac81 commit e2e402c

File tree

3 files changed

+33
-6
lines changed

3 files changed

+33
-6
lines changed

docs/client-concepts/low-level/getting-started.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ There are many other <<configuration-options,configuration options>> on `Connect
5151
* whether HTTP compression support should be enabled on the client
5252

5353
[float]
54-
==== Connecton pools
54+
==== Connection pools
5555

5656
`ConnectionConfiguration` is not restricted to being passed a single address for Elasticsearch. There are several different
5757
types of <<connection-pooling,Connection pool>> available, each with different characteristics that can be used to
@@ -99,10 +99,10 @@ var person = new Person
9999
LastName = "Laarman"
100100
};
101101
102-
var indexResponse = lowlevelClient.Index<BytesResponse>("people", "person", "1", PostData.Serializable(person)); <1>
102+
var indexResponse = lowlevelClient.Index<BytesResponse>("people", "person", "1", PostData.Serializable(person)); <1>
103103
byte[] responseBytes = indexResponse.Body;
104104
105-
var asyncIndexResponse = await lowlevelClient.IndexAsync<StringResponse>("people", "person", "1", PostData.Serializable(person)); <2>
105+
var asyncIndexResponse = await lowlevelClient.IndexAsync<StringResponse>("people", "person", "1", PostData.Serializable(person)); <2>
106106
string responseString = asyncIndexResponse.Body;
107107
----
108108
<1> synchronous method that returns an `IIndexResponse`
@@ -238,8 +238,8 @@ is successful
238238
----
239239
var searchResponse = lowlevelClient.Search<BytesResponse>("people", "person", PostData.Serializable(new { match_all = new {} }));
240240
241-
var success = searchResponse.Success; <1>
242-
var successOrKnownError = searchResponse.SuccessOrKnownError; <2>
241+
var success = searchResponse.Success; <1>
242+
var successOrKnownError = searchResponse.SuccessOrKnownError; <2>
243243
var exception = searchResponse.OriginalException; <3>
244244
----
245245
<1> Response is in the 200 range, or an expected response for the given request
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using FluentAssertions;
2+
using System.Linq;
3+
using Elastic.Xunit.XunitPlumbing;
4+
using Tests.Core.ManagedElasticsearch.Clusters;
5+
using Tests.Domain;
6+
7+
namespace Tests.Reproduce
8+
{
9+
public class GithubIssue3412 : IClusterFixture<WritableCluster>
10+
{
11+
private readonly WritableCluster _cluster;
12+
13+
public GithubIssue3412(WritableCluster cluster) => _cluster = cluster;
14+
15+
[I]
16+
public void WildcardBeingEscapedHasNoBarringsOnResult()
17+
{
18+
var indexedDocument1 = _cluster.Client.Index(new Project { Name = "project-1" }, d => d.Index("prefixed-1"));
19+
var indexedDocument2 = _cluster.Client.Index(new Project { Name = "project-2" }, d => d.Index("prefixed-2"));
20+
var refresh = _cluster.Client.Refresh("prefixed-*");
21+
var search = _cluster.Client.Search<Project>(s => s.Index("prefixed-*"));
22+
search.Total.Should().Be(2);
23+
var queriedIndices = search.Hits.Select(h => h.Index).ToArray();
24+
queriedIndices.Should().BeEquivalentTo(new[] {"prefixed-1", "prefixed-2"});
25+
}
26+
}
27+
}

src/Tests/Tests/ClientConcepts/LowLevel/GettingStarted.doc.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void UsingConnectionSettings()
6464
* - whether HTTP compression support should be enabled on the client
6565
*
6666
* [float]
67-
* ==== Connecton pools
67+
* ==== Connection pools
6868
*
6969
* `ConnectionConfiguration` is not restricted to being passed a single address for Elasticsearch. There are several different
7070
* types of <<connection-pooling,Connection pool>> available, each with different characteristics that can be used to

0 commit comments

Comments
 (0)