Skip to content

Commit 5f6dde3

Browse files
gmarzgmarz
committed
Merge tag '1.0.2'
1.0.2
2 parents 1160dce + 795c0ef commit 5f6dde3

File tree

26 files changed

+151
-44
lines changed

26 files changed

+151
-44
lines changed

‎build/Elasticsearch.Net.Connection.HttpClient.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.HttpClient</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2</version>
66
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.0.1"/>
16+
<dependency id="Elasticsearch.Net" version="1.0.2"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

‎build/Elasticsearch.Net.Connection.Thrift.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.Thrift</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2</version>
66
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.0.1"/>
16+
<dependency id="Elasticsearch.Net" version="1.0.2"/>
1717
<dependency id="NetReflector" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>

‎build/Elasticsearch.Net.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2</version>
66
<title>Elasticsearch.Net - official low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>

‎build/NEST.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>NEST</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2</version>
66
<title>NEST - Elasticsearch Client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.0.1"/>
16+
<dependency id="Elasticsearch.Net" version="1.0.2"/>
1717
<dependency id="Newtonsoft.Json" version="6.0.1" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.0.1")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.1")]
10+
[assembly: AssemblyFileVersionAttribute("1.0.2")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.2")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.0.1")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.1")]
10+
[assembly: AssemblyFileVersionAttribute("1.0.2")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.2")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.0.1")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.1")]
10+
[assembly: AssemblyFileVersionAttribute("1.0.2")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.2")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.0.1")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.1")]
10+
[assembly: AssemblyFileVersionAttribute("1.0.2")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.2")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Elasticsearch.Net/Connection/InMemoryConnection.cs‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Diagnostics;
34
using System.IO;
45
using System.Net;
56
using System.Text;
@@ -13,23 +14,27 @@ public class InMemoryConnection : HttpConnection
1314
private byte[] _fixedResultBytes = Encoding.UTF8.GetBytes("{ \"USING NEST IN MEMORY CONNECTION\" : null }");
1415
private int _statusCode;
1516

16-
public InMemoryConnection()
17-
: base(new ConnectionConfiguration())
17+
public List<Tuple<string, Uri, byte[]>> Requests = new List<Tuple<string, Uri, byte[]>>();
18+
19+
public bool RecordRequests { get; set;}
20+
21+
public InMemoryConnection() : base(new ConnectionConfiguration())
1822
{
1923

2024
}
21-
public InMemoryConnection(IConnectionConfigurationValues settings)
22-
: base(settings)
25+
public InMemoryConnection(IConnectionConfigurationValues settings) : base(settings)
2326
{
2427
_statusCode = 200;
2528
}
2629

27-
public InMemoryConnection(IConnectionConfigurationValues settings, string fixedResult, int statusCode = 200)
28-
: this(settings)
30+
public InMemoryConnection(IConnectionConfigurationValues settings, string fixedResult, int statusCode = 200) : this(settings)
2931
{
3032
_fixedResultBytes = Encoding.UTF8.GetBytes(fixedResult);
3133
_statusCode = statusCode;
3234
}
35+
36+
37+
3338

3439
protected override ElasticsearchResponse<Stream> DoSynchronousRequest(HttpWebRequest request, byte[] data = null, IRequestConfiguration requestSpecificConfig = null)
3540
{
@@ -45,6 +50,12 @@ private ElasticsearchResponse<Stream> ReturnConnectionStatus(HttpWebRequest requ
4550
cs.Response = new MemoryStream(_fixedResultBytes);
4651
if (this.ConnectionSettings.ConnectionStatusHandler != null)
4752
this.ConnectionSettings.ConnectionStatusHandler(cs);
53+
54+
if (this.RecordRequests)
55+
{
56+
this.Requests.Add(Tuple.Create(method, request.RequestUri, data));
57+
}
58+
4859
return cs;
4960
}
5061

‎src/Elasticsearch.Net/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.0.1")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.1")]
10+
[assembly: AssemblyFileVersionAttribute("1.0.2")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.2")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

0 commit comments

Comments
 (0)