Skip to content

Commit 695eb1c

Browse files
committed
moved settings configuration to static class
1 parent 736bbfc commit 695eb1c

File tree

16 files changed

+46
-147
lines changed

16 files changed

+46
-147
lines changed

src/Elasticsearch.Net/Domain/ElasticsearchDynamicValue.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.ComponentModel;
55
using System.Dynamic;
66
using System.Globalization;
7+
using System.Linq;
78
using System.Linq.Expressions;
89
using System.Reflection;
910
using System.Runtime.CompilerServices;
@@ -85,6 +86,11 @@ public ElasticsearchDynamicValue this[int i]
8586
{
8687
return new ElasticsearchDynamicValue(l[i]);
8788
}
89+
var d = this.Value as IDictionary<string, object>;
90+
if (d != null && d.Count -1 >= i)
91+
{
92+
return new ElasticsearchDynamicValue(d.Values.ToList()[i]);
93+
}
8894
return new ElasticsearchDynamicValue(null);
8995
}
9096
}

src/Nest/Resolvers/Converters/DictionaryKeysAreNotPropertyNamesJsonConverter.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
4141
continue;
4242
string key;
4343
var pp = entry.Key as PropertyPathMarker;
44-
var pn = entry.Key as PropertyNameMarker;
45-
if (pp != null)
44+
var pn = entry.Key as PropertyNameMarker;
45+
if (contract == null)
46+
key = Convert.ToString(entry.Key, CultureInfo.InvariantCulture);
47+
else if (pp != null)
4648
key = contract.Infer.PropertyPath(pp);
4749
else if (pn != null)
4850
key = contract.Infer.PropertyName(pn);

src/Tests/Nest.Tests.Integration/Reproduce/ReproduceConnectionStallsTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void SearchShouldNotHaveBlips()
4747
//Search once so that caches are sure to exist.
4848
var timing = this.Search();
4949

50+
5051
var timings = new List<Timings>();
5152
for (var i = 0; i < 1000; i++)
5253
{

src/Tests/Nest.Tests.Unit/BaseJsonTests.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,16 @@
1616
using System.Reflection;
1717
using System.IO;
1818
using Moq;
19+
using PUrify;
1920

2021
namespace Nest.Tests.Unit
2122
{
23+
public static class UnitTestDefaults
24+
{
25+
public static readonly Uri Uri = new Uri("http://localhost:9200").Purify();
26+
public static readonly string DefaultIndex = "nest_test_data";
27+
}
28+
2229
public class BaseJsonTests
2330
{
2431
protected readonly IConnectionSettingsValues _settings;
@@ -30,7 +37,7 @@ public class BaseJsonTests
3037

3138
public BaseJsonTests()
3239
{
33-
this._settings = new ConnectionSettings(Test.Default.Uri, Test.Default.DefaultIndex)
40+
this._settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
3441
.ExposeRawResponse();
3542
this._connection = new InMemoryConnection(this._settings);
3643
this._client = new ElasticClient(this._settings, this._connection);
@@ -45,7 +52,7 @@ protected void deb(string s)
4552
}
4653
protected ElasticClient GetFixedReturnClient(MethodBase methodInfo, string fileName)
4754
{
48-
var settings = new ConnectionSettings(Test.Default.Uri, "default-index")
55+
var settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
4956
.ExposeRawResponse();
5057
var file = this.GetFileFromMethod(methodInfo, fileName);
5158
var jsonResponse = File.ReadAllText(file);

src/Tests/Nest.Tests.Unit/Cluster/HealthTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void ClusterHealth()
1919
[Test]
2020
public void ClusterHealthPerIndex()
2121
{
22-
var r = this._client.ClusterHealth(h=>h.Index(Test.Default.DefaultIndex).Level(LevelOptions.Cluster));
22+
var r = this._client.ClusterHealth(h=>h.Index(UnitTestDefaults.DefaultIndex).Level(LevelOptions.Cluster));
2323
var u = new Uri(r.ConnectionStatus.RequestUrl);
2424
u.AbsolutePath.Should().StartWith("/_cluster/health/nest_test_data");
2525
u.Query.Should().Contain("level=cluster");

src/Tests/Nest.Tests.Unit/Cluster/State/StateTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void ClusterState()
2020
[Test]
2121
public void ClusterStatePerIndex()
2222
{
23-
var r = this._client.ClusterState(h=>h.Index(Test.Default.DefaultIndex).FlatSettings());
23+
var r = this._client.ClusterState(h=>h.Index(UnitTestDefaults.DefaultIndex).FlatSettings());
2424
var u = new Uri(r.ConnectionStatus.RequestUrl);
2525
u.AbsolutePath.Should().StartWith("/_cluster/state");
2626
u.Query.Should().Contain("flat_settings=true");

src/Tests/Nest.Tests.Unit/Core/Indices/Analysis/BaseAnalysisTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class BaseAnalysisTests : BaseJsonTests
1111
{
1212
public IIndicesOperationResponse Analysis(Func<AnalysisDescriptor, AnalysisDescriptor> analysisSelector)
1313
{
14-
var result = this._client.CreateIndex(Test.Default.DefaultIndex, c => c
14+
var result = this._client.CreateIndex(UnitTestDefaults.DefaultIndex, c => c
1515
.Analysis(analysisSelector)
1616
);
1717
result.Should().NotBeNull();

src/Tests/Nest.Tests.Unit/Internals/Inferno/HostNameWithPathTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ namespace Nest.Tests.Unit.Internals.Inferno
1111
[TestFixture]
1212
public class HostNameWithPathTests
1313
{
14-
private static Uri HostName = new Uri(Test.Default.Uri, "/my-api-token");
15-
private static ConnectionSettings Settings = new ConnectionSettings(HostName,Test.Default.DefaultIndex);
14+
private static Uri HostName = new Uri(UnitTestDefaults.Uri, "/my-api-token");
15+
private static ConnectionSettings Settings = new ConnectionSettings(HostName, UnitTestDefaults.DefaultIndex);
1616

1717
private static ElasticClient Client = new ElasticClient(Settings, new InMemoryConnection(Settings));
1818

src/Tests/Nest.Tests.Unit/Internals/Inferno/MapTypeNamesTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class MyCustomAtrributeName { }
2222
[Test]
2323
public void ResolveToSepcifiedTypeNames()
2424
{
25-
var clientSettings = new ConnectionSettings(Test.Default.Uri, "mydefaultindex")
25+
var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri, "mydefaultindex")
2626
.MapDefaultTypeNames(p => p
2727
.Add(typeof(Car), "automobile")
2828
.Add(typeof(Person), "human")
@@ -61,7 +61,7 @@ public void ResolveToSepcifiedTypeNames()
6161
[Test]
6262
public void DefaultTypeNamesTakePrecedenceOverCustomTypeNameInferrer()
6363
{
64-
var clientSettings = new ConnectionSettings(Test.Default.Uri, "mydefaultindex")
64+
var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri, "mydefaultindex")
6565
.MapDefaultTypeNames(p => p
6666
.Add(typeof(Developer), "codemonkey")
6767
)
@@ -81,7 +81,7 @@ public void DefaultTypeNamesTakePrecedenceOverCustomTypeNameInferrer()
8181
[Test]
8282
public void AttributeTypeNamesTakePrecedenceOverDefaultTypeNameInferrer()
8383
{
84-
var clientSettings = new ConnectionSettings(Test.Default.Uri, "mydefaultindex")
84+
var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri, "mydefaultindex")
8585
.SetDefaultTypeNameInferrer(t => t.Name.ToUpperInvariant())
8686
;
8787

@@ -94,7 +94,7 @@ public void AttributeTypeNamesTakePrecedenceOverDefaultTypeNameInferrer()
9494
[Test]
9595
public void MapTypeIndicesTakesPrecedenceOverAttributeName()
9696
{
97-
var clientSettings = new ConnectionSettings(Test.Default.Uri,"mydefaultindex")
97+
var clientSettings = new ConnectionSettings(UnitTestDefaults.Uri,"mydefaultindex")
9898
.MapDefaultTypeNames(dt=>dt
9999
.Add(typeof(MyCustomAtrributeName), "micutype")
100100
)

src/Tests/Nest.Tests.Unit/Internals/Inferno/PropertyNameResolverTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ internal class UserItemData
6565
[Test]
6666
public void TestUsesDefaultPropertyNameResolver()
6767
{
68-
var settings = new ConnectionSettings(Test.Default.Uri, Test.Default.DefaultIndex)
68+
var settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
6969
.SetDefaultPropertyNameInferrer(p => p);
7070
var client = new ElasticClient(settings);
7171
Expression<Func<UserItemData, object>> exp = (m) => m.UserLabels;

src/Tests/Nest.Tests.Unit/Internals/Serialize/SerializeTests.cs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,20 @@ public void ClassWithCollectionSerializes()
5252
[Test]
5353
public void SerializingSearchIsFastEnough()
5454
{
55-
//Do a serialize once, give json.net a fair fighting chance to cache
56-
var data = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
57-
.From(0)
58-
.Size(10)
59-
.Fields(f => f.Id, f => f.Country)
60-
.SortAscending(f => f.LOC)
61-
.SortDescending(f => f.Country)
62-
.Query(q => q
63-
.MatchAll()
64-
)
65-
);
66-
Assert.NotNull(data);
67-
var sw = Stopwatch.StartNew();
55+
//seraialize once to build cache
56+
var randomDeserialize = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
57+
.From(0)
58+
.Size(10)
59+
.Fields(f => f.Id, f => f.Country)
60+
.SortAscending(f => f.LOC)
61+
.SortDescending(f => f.Country)
62+
.Query(q => q
63+
.MatchAll()
64+
)
65+
);
6866

69-
data = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
67+
var sw = Stopwatch.StartNew();
68+
var data = this._client.Serializer.Serialize(new SearchDescriptor<ElasticsearchProject>()
7069
.From(0)
7170
.Size(10)
7271
.Fields(f => f.Id, f => f.Country)
@@ -77,7 +76,7 @@ public void SerializingSearchIsFastEnough()
7776
)
7877
);
7978
Assert.LessOrEqual(sw.ElapsedMilliseconds, 10);
80-
Assert.NotNull(data);
79+
Assert.NotNull(data);
8180

8281
}
8382
}

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,6 @@
284284
<Compile Include="Search\Suggest\PhraseSuggestTests.cs" />
285285
<Compile Include="Search\Suggest\TermSuggestTests.cs" />
286286
<Compile Include="Settings\UsePrettyResponseTests.cs" />
287-
<Compile Include="Test.Designer.cs">
288-
<DependentUpon>Test.settings</DependentUpon>
289-
<AutoGen>True</AutoGen>
290-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
291-
</Compile>
292287
<Compile Include="TestElasticClient.cs" />
293288
<Compile Include="Core\Update\UpdateTests.cs" />
294289
</ItemGroup>
@@ -850,10 +845,6 @@
850845
<None Include="Search\Sort\RandomScriptSort.json">
851846
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
852847
</None>
853-
<None Include="Test.settings">
854-
<Generator>SettingsSingleFileGenerator</Generator>
855-
<LastGenOutput>Test.Designer.cs</LastGenOutput>
856-
</None>
857848
<None Include="Search\Query\Singles\Terms\TermsOfTypeInt.json">
858849
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
859850
</None>

src/Tests/Nest.Tests.Unit/Settings/UsePrettyResponseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class UsePrettyResponses : BaseJsonTests
1212
[Test]
1313
public void UsePrettyResponsesShouldSurviveUrlModififications()
1414
{
15-
var settings = new ConnectionSettings(Test.Default.Uri, Test.Default.DefaultIndex)
15+
var settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
1616
.UsePrettyResponses();
1717
var connection = new InMemoryConnection(settings);
1818
var client = new ElasticClient(settings, connection);

src/Tests/Nest.Tests.Unit/Test.Designer.cs

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/Tests/Nest.Tests.Unit/Test.settings

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/Tests/Nest.Tests.Unit/TestElasticClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static class TestElasticClient
1111
public static ConnectionSettings Settings;
1212
static TestElasticClient()
1313
{
14-
Settings = new ConnectionSettings(Test.Default.Uri,"nest_test_data");
14+
Settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex);
1515

1616
Client = new ElasticClient(Settings);
1717
}

0 commit comments

Comments
 (0)