Skip to content

Commit 45ed63e

Browse files
committed
fix #628 dashes are striped of the the first level of properties when using dynamic dictionary
1 parent 97be6fe commit 45ed63e

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

Diff for: src/Elasticsearch.Net/Domain/DynamicDictionary.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ private static KeyValuePair<string, dynamic> GetDynamicKeyValuePair(KeyValuePair
323323

324324
private static string GetNeutralKey(string key)
325325
{
326-
return key.Replace("-", string.Empty);
326+
return key;
327327
}
328328
}
329329
}

Diff for: src/Tests/Elasticsearch.Net.Integration.Yaml/cluster.reroute/11_explain.yaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void ExplainApiForNonExistantNodeShard3Test()
6868
this.Do(()=> _client.ClusterState("master_node"));
6969

7070
//set node_id = _response.master_node;
71-
var node_id = _response.master_node;
71+
string node_id = _response.master_node;
7272

7373
//do cluster.reroute
7474
_body = new {

Diff for: src/Tests/Nest.Tests.Integration/Reproduce/Reproduce628Tests.cs

+31-31
Original file line numberDiff line numberDiff line change
@@ -59,37 +59,37 @@ public void AliasesWithDashesAreNotStripped()
5959

6060
}
6161

62-
[Test]
63-
public void IndexWithDashesAreNotStripped()
64-
{
65-
var index = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes";
66-
var x = this._client.CreateIndex(index);
67-
x.Acknowledged.Should().BeTrue();
68-
var alias = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes-alias";
69-
var aliasResult = this._client.Alias(a => a.Add(aa => aa.Index(index).Alias(alias)));
70-
aliasResult.IsValid.Should().BeTrue();
71-
aliasResult.Acknowledged.Should().BeTrue();
72-
73-
var elasticsearchClient = new ElasticsearchClient(ElasticsearchConfiguration.Settings());
74-
var dynamicResult = elasticsearchClient.IndicesGetAliasForAll(alias);
75-
dynamicResult.Response.ContainsKey(index).Should().BeTrue();
76-
}
77-
78-
[Test]
79-
public void IndexWithDashesAreNotStripped2()
80-
{
81-
var index = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes";
82-
var x = this._client.CreateIndex(index);
83-
x.Acknowledged.Should().BeTrue();
84-
var alias = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes-alias";
85-
var aliasResult = this._client.Alias(a => a.Add(aa => aa.Index(index).Alias(alias)));
86-
aliasResult.IsValid.Should().BeTrue();
87-
aliasResult.Acknowledged.Should().BeTrue();
88-
89-
var elasticsearchClient = new ElasticsearchClient(ElasticsearchConfiguration.Settings());
90-
var dynamicResult = elasticsearchClient.IndicesGetAlias(alias);
91-
dynamicResult.Response.ContainsKey(index).Should().BeTrue();
92-
}
62+
[Test]
63+
public void IndexWithDashesAreNotStripped()
64+
{
65+
var index = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes";
66+
var x = this._client.CreateIndex(index);
67+
x.Acknowledged.Should().BeTrue();
68+
var alias = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes-alias";
69+
var aliasResult = this._client.Alias(a => a.Add(aa => aa.Index(index).Alias(alias)));
70+
aliasResult.IsValid.Should().BeTrue();
71+
aliasResult.Acknowledged.Should().BeTrue();
72+
73+
var elasticsearchClient = new ElasticsearchClient(ElasticsearchConfiguration.Settings());
74+
var dynamicResult = elasticsearchClient.IndicesGetAliasForAll(alias);
75+
dynamicResult.Response.ContainsKey(index).Should().BeTrue();
76+
}
77+
78+
[Test]
79+
public void IndexWithDashesAreNotStripped2()
80+
{
81+
var index = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes";
82+
var x = this._client.CreateIndex(index);
83+
x.Acknowledged.Should().BeTrue();
84+
var alias = ElasticsearchConfiguration.NewUniqueIndexName() + "-dashes-alias";
85+
var aliasResult = this._client.Alias(a => a.Add(aa => aa.Index(index).Alias(alias)));
86+
aliasResult.IsValid.Should().BeTrue();
87+
aliasResult.Acknowledged.Should().BeTrue();
88+
89+
var elasticsearchClient = new ElasticsearchClient(ElasticsearchConfiguration.Settings());
90+
var dynamicResult = elasticsearchClient.IndicesGetAlias(alias);
91+
dynamicResult.Response.ContainsKey(index).Should().BeTrue();
92+
}
9393

9494

9595
}

Diff for: src/Tests/Nest.Tests.Unit/Search/suggest/CompletionSuggestTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void CompletionSuggestDescriptorFuzzyTest()
8383
var json = TestElasticClient.Serialize(completionSuggestDescriptor);
8484

8585
var expected = @"{
86-
fuzzy"": {
86+
""fuzzy"": {
8787
edit_distance: 2,
8888
transpositions: false,
8989
min_length: 5,

0 commit comments

Comments
 (0)