Skip to content

Commit f05b440

Browse files
committed
revert accidental commit of files
1 parent ab3db2c commit f05b440

File tree

9 files changed

+132
-160
lines changed

9 files changed

+132
-160
lines changed

src/Elasticsearch.Net/Auditing/Audit.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ public class Audit
1111
public string Path { get; internal set; }
1212
public Exception Exception { get; internal set; }
1313

14-
public Audit(AuditEvent type, DateTime started)
14+
public Audit(AuditEvent type, DateTime occured)
1515
{
1616
this.Event = type;
17-
this.Started = started;
17+
this.Started = occured;
1818
}
1919

2020
public override string ToString()
2121
{
2222
var took = Started - Ended;
23-
return $"Node: {Node?.Uri}, Event: {Event.GetStringValue()} NodeAlive: {Node?.IsAlive}, Took: {took}";
23+
return $"Node: {Node?.Uri}, Event: {Event.GetStringValue()} NodeAlive: {Node?.IsAlive}, Took: {took.ToString()}";
2424
}
2525
}
2626
}

src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace Elasticsearch.Net
1010
/// </summary>
1111
public class ConnectionConfiguration : ConnectionConfiguration<ConnectionConfiguration>
1212
{
13-
public static readonly TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
14-
public static readonly TimeSpan DefaultPingTimeout = TimeSpan.FromSeconds(2);
15-
public static readonly TimeSpan DefaultPingTimeoutOnSSL = TimeSpan.FromSeconds(5);
13+
public static TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
14+
public static TimeSpan DefaultPingTimeout = TimeSpan.FromSeconds(2);
15+
public static TimeSpan DefaultPingTimeoutOnSSL = TimeSpan.FromSeconds(5);
1616

1717
/// <summary>
1818
/// ConnectionConfiguration allows you to control how ElasticsearchClient behaves and where/how it connects
@@ -47,10 +47,6 @@ public ConnectionConfiguration(IConnectionPool connectionPool, Func<ConnectionCo
4747
public ConnectionConfiguration(IConnectionPool connectionPool, IConnection connection, Func<ConnectionConfiguration, IElasticsearchSerializer> serializerFactory)
4848
: base(connectionPool, connection, serializerFactory)
4949
{ }
50-
51-
public void Dispose()
52-
{
53-
}
5450
}
5551

5652
[Browsable(false)]
@@ -312,11 +308,6 @@ public T BasicAuthentication(string userName, string password)
312308
/// <para>Note: HTTP pipelining must also be enabled in Elasticsearch for this to work properly.</para>
313309
/// </summary>
314310
public T EnableHttpPipelining(bool enabled = true) => Assign(a => a._enableHttpPipelining = enabled);
315-
316-
public void Dispose()
317-
{
318-
this._connectionPool?.Dispose();
319-
}
320311
}
321312
}
322313

src/Elasticsearch.Net/Configuration/IConnectionConfigurationValues.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Elasticsearch.Net
55
{
6-
public interface IConnectionConfigurationValues : IDisposable
6+
public interface IConnectionConfigurationValues
77
{
88
/// <summary> The connection pool to use when talking with elasticsearch </summary>
99
IConnectionPool ConnectionPool { get; }

src/Elasticsearch.Net/ConnectionPool/IConnectionPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Elasticsearch.Net
55
{
6-
public interface IConnectionPool : IDisposable
6+
public interface IConnectionPool
77
{
88
/// <summary>
99
/// Returns a readonly constant view of all the nodes in the cluster, this might involve creating copies of the nodes e.g

src/Elasticsearch.Net/ConnectionPool/SingleNodeConnectionPool.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,5 @@ public SingleNodeConnectionPool(Uri uri, IDateTimeProvider dateTimeProvider = nu
2929
}
3030

3131
public IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null) => this.Nodes;
32-
33-
public void Dispose()
34-
{
35-
}
3632
}
3733
}

src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,5 @@ public override IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = nu
7373
}
7474
}
7575

76-
public override void Dispose()
77-
{
78-
this._readerWriter?.Dispose();
79-
base.Dispose();
80-
}
8176
}
8277
}

src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,5 @@ public virtual IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = nul
9797
}
9898
}
9999

100-
public virtual void Dispose()
101-
{
102-
}
103100
}
104101
}

src/Elasticsearch.Net/Elasticsearch.Net.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<WarningLevel>4</WarningLevel>
2424
<UseVSHostingProcess>false</UseVSHostingProcess>
2525
<Prefer32Bit>false</Prefer32Bit>
26-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
2726
</PropertyGroup>
2827
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2928
<DebugType>pdbonly</DebugType>
@@ -55,7 +54,6 @@
5554
<ItemGroup>
5655
<Compile Include="Configuration\RequestConfiguration.cs" />
5756
<Compile Include="Exceptions\UnexpectedElasticsearchClientException.cs" />
58-
<Compile Include="GlobalSuppressions.cs" />
5957
<Compile Include="Transport\Pipeline\PipelineException.cs" />
6058
<Compile Include="Connection\HttpMethod.cs" />
6159
<Compile Include="Auditing\Audit.cs" />

0 commit comments

Comments
 (0)