Skip to content

Commit c121866

Browse files
committed
Rename Elasticsearch.Net.VirtualizedCluster to Elastic.Transport.VirtualizedCluster
1 parent 5c03079 commit c121866

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+125
-136
lines changed

Elasticsearch.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiGenerator", "src\ApiGene
6565
EndProject
6666
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocGenerator", "src\DocGenerator\DocGenerator.csproj", "{AB8A08CC-FCA5-49AF-901A-9120DAAA11D6}"
6767
EndProject
68-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.Net.VirtualizedCluster", "src\Elasticsearch.Net.VirtualizedCluster\Elasticsearch.Net.VirtualizedCluster.csproj", "{CFE97627-8DD3-470B-B7CF-78B62E1D305D}"
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Transport.VirtualizedCluster", "src\Elastic.Transport.VirtualizedCluster\Elastic.Transport.VirtualizedCluster.csproj", "{CFE97627-8DD3-470B-B7CF-78B62E1D305D}"
6969
EndProject
7070
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExamplesGenerator", "src\ExamplesGenerator\ExamplesGenerator.csproj", "{1B9CCE9F-10CE-410A-BF9B-80935F3710A7}"
7171
EndProject

src/Elasticsearch.Net.VirtualizedCluster/Audit/Auditor.cs renamed to src/Elastic.Transport.VirtualizedCluster/Audit/Auditor.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
using System.Linq;
88
using System.Text;
99
using System.Threading.Tasks;
10-
using Elastic.Transport;
1110
using Elastic.Transport.Extensions;
12-
using Elasticsearch.Net.VirtualizedCluster.Extensions;
11+
using Elastic.Transport.VirtualizedCluster.Extensions;
1312

14-
namespace Elasticsearch.Net.VirtualizedCluster.Audit
13+
namespace Elastic.Transport.VirtualizedCluster.Audit
1514
{
1615
public class Auditor
1716
{
@@ -191,8 +190,8 @@ private Auditor AssertAuditTrails(ClientCall callTrace, int nthCall)
191190
callTrace.AssertResponse?.Invoke(Response);
192191
callTrace.AssertResponse?.Invoke(ResponseAsync);
193192

194-
callTrace?.AssertPoolAfterCall?.Invoke(_cluster.ConnectionPool);
195-
callTrace?.AssertPoolAfterCall?.Invoke(_clusterAsync.ConnectionPool);
193+
callTrace.AssertPoolAfterCall?.Invoke(_cluster.ConnectionPool);
194+
callTrace.AssertPoolAfterCall?.Invoke(_clusterAsync.ConnectionPool);
196195
return new Auditor(_cluster, _clusterAsync);
197196
}
198197

src/Elasticsearch.Net.VirtualizedCluster/Audit/Audits.cs renamed to src/Elastic.Transport.VirtualizedCluster/Audit/Audits.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44

55
using System;
66
using System.Collections.Generic;
7-
using Elastic.Transport;
87
using Elastic.Transport.Diagnostics.Auditing;
98

10-
namespace Elasticsearch.Net.VirtualizedCluster.Audit
9+
namespace Elastic.Transport.VirtualizedCluster.Audit
1110
{
1211
public class CallTraceState
1312
{
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<PackageId>Elastic.Transport.VirtualizedCluster</PackageId>
4+
<Title>Elastic.Transport.VirtualizedCluster - An in memory IConnection that can simulate large cluster</Title>
5+
<PackageTags>elasticsearch;elastic;search;lucene;nest</PackageTags>
6+
<Description>Provides a way to assert transport behaviour through a rule engine backed VirtualClusterConnection</Description>
7+
</PropertyGroup>
8+
9+
<PropertyGroup>
10+
<IsPackable>true</IsPackable>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<TargetFramework>netstandard2.0</TargetFramework>
13+
</PropertyGroup>
14+
<ItemGroup Condition="'$(TestPackageVersion)'!=''">
15+
<PackageReference Include="Elastic.Transport" Version="$(TestPackageVersion)"/>
16+
</ItemGroup>
17+
<ItemGroup Condition="'$(TestPackageVersion)'==''">
18+
<ProjectReference Include="$(SolutionRoot)\src\Elastic.Transport\Elastic.Transport.csproj"/>
19+
</ItemGroup>
20+
</Project>

src/Elasticsearch.Net.VirtualizedCluster/Extensions/NumericExtensions.cs renamed to src/Elastic.Transport.VirtualizedCluster/Extensions/NumericExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5-
namespace Elasticsearch.Net.VirtualizedCluster.Extensions
5+
namespace Elastic.Transport.VirtualizedCluster.Extensions
66
{
77
internal static class NumericExtensions
88
{

src/Elasticsearch.Net.VirtualizedCluster/FixedPipelineFactory.cs renamed to src/Elastic.Transport.VirtualizedCluster/FixedPipelineFactory.cs

+5-8
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information
44

5-
using Elastic.Transport;
65
using Elastic.Transport.Products;
76

8-
namespace Elasticsearch.Net.VirtualizedCluster
7+
namespace Elastic.Transport.VirtualizedCluster
98
{
109
public class FixedPipelineFactory : IRequestPipelineFactory
1110
{
@@ -15,23 +14,21 @@ public FixedPipelineFactory(IConnectionConfigurationValues connectionSettings, I
1514
MemoryStreamFactory = ConnectionConfiguration.DefaultMemoryStreamFactory;
1615

1716
Settings = connectionSettings;
18-
Pipeline = Create(Settings, DateTimeProvider, MemoryStreamFactory, new SearchRequestParameters(), productRegistration);
17+
Pipeline = Create(Settings, DateTimeProvider, MemoryStreamFactory, new RequestParameters(HttpMethod.GET, supportsBody: false), productRegistration);
18+
Transport = new Transport<IConnectionConfigurationValues>(Settings, this, DateTimeProvider, MemoryStreamFactory, ElasticsearchProductRegistration.Default);
1919
}
2020

21-
public ElasticLowLevelClient Client => new ElasticLowLevelClient(Transport);
22-
2321
public IRequestPipeline Pipeline { get; }
2422

2523
private IDateTimeProvider DateTimeProvider { get; }
2624
private IMemoryStreamFactory MemoryStreamFactory { get; }
2725
private IConnectionConfigurationValues Settings { get; }
26+
public ITransport<IConnectionConfigurationValues> Transport { get; }
2827

29-
private Transport<IConnectionConfigurationValues> Transport =>
30-
new Transport<IConnectionConfigurationValues>(Settings, this, DateTimeProvider, MemoryStreamFactory, ElasticsearchProductRegistration.Default);
3128

3229
public IRequestPipeline Create(IConnectionConfigurationValues configurationValues, IDateTimeProvider dateTimeProvider,
3330
IMemoryStreamFactory memoryStreamFactory, IRequestParameters requestParameters, IProductRegistration productRegistration
3431
) =>
35-
new RequestPipeline(Settings, DateTimeProvider, MemoryStreamFactory, requestParameters ?? new SearchRequestParameters(), productRegistration);
32+
new RequestPipeline(Settings, DateTimeProvider, MemoryStreamFactory, requestParameters ?? new RequestParameters(HttpMethod.GET, supportsBody: false), productRegistration);
3633
}
3734
}

src/Elasticsearch.Net.VirtualizedCluster/MockResponses/SniffResponseBytes.cs renamed to src/Elastic.Transport.VirtualizedCluster/MockResponses/SniffResponseBytes.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
using System;
66
using System.Collections.Generic;
77
using System.Linq;
8-
using Elastic.Transport;
98

10-
namespace Elasticsearch.Net.VirtualizedCluster.MockResponses
9+
namespace Elastic.Transport.VirtualizedCluster.MockResponses
1110
{
1211
public static class SniffResponseBytes
1312
{

src/Elasticsearch.Net.VirtualizedCluster/Providers/TestableDateTimeProvider.cs renamed to src/Elastic.Transport.VirtualizedCluster/Providers/TestableDateTimeProvider.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// See the LICENSE file in the project root for more information
44

55
using System;
6-
using Elastic.Transport;
76

8-
namespace Elasticsearch.Net.VirtualizedCluster.Providers
7+
namespace Elastic.Transport.VirtualizedCluster.Providers
98
{
109
public class TestableDateTimeProvider : DateTimeProvider
1110
{

src/Elasticsearch.Net.VirtualizedCluster/Rules/ClientCallRule.cs renamed to src/Elastic.Transport.VirtualizedCluster/Rules/ClientCallRule.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using TheException = System.Net.WebException;
1010
#endif
1111

12-
namespace Elasticsearch.Net.VirtualizedCluster.Rules
12+
namespace Elastic.Transport.VirtualizedCluster.Rules
1313
{
1414
public interface IClientCallRule : IRule { }
1515

src/Elasticsearch.Net.VirtualizedCluster/Rules/PingRule.cs renamed to src/Elastic.Transport.VirtualizedCluster/Rules/PingRule.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66

7-
namespace Elasticsearch.Net.VirtualizedCluster.Rules
7+
namespace Elastic.Transport.VirtualizedCluster.Rules
88
{
99
public class PingRule : RuleBase<PingRule>
1010
{

src/Elasticsearch.Net.VirtualizedCluster/Rules/RuleBase.cs renamed to src/Elastic.Transport.VirtualizedCluster/Rules/RuleBase.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44

55
using System;
66
using System.Threading;
7-
using Elastic.Transport;
87

9-
namespace Elasticsearch.Net.VirtualizedCluster.Rules
8+
namespace Elastic.Transport.VirtualizedCluster.Rules
109
{
1110
public interface IRule
1211
{

src/Elasticsearch.Net.VirtualizedCluster/Rules/RuleOption.cs renamed to src/Elastic.Transport.VirtualizedCluster/Rules/RuleOption.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66

7-
namespace Elasticsearch.Net.VirtualizedCluster.Rules
7+
namespace Elastic.Transport.VirtualizedCluster.Rules
88
{
99
/// <summary>
1010
/// Represents the union of two types, <typeparamref name="TFirst" /> and <typeparamref name="TSecond" />.

src/Elasticsearch.Net.VirtualizedCluster/Rules/SniffRule.cs renamed to src/Elastic.Transport.VirtualizedCluster/Rules/SniffRule.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66

7-
namespace Elasticsearch.Net.VirtualizedCluster.Rules
7+
namespace Elastic.Transport.VirtualizedCluster.Rules
88
{
99
public interface ISniffRule : IRule
1010
{

src/Elasticsearch.Net.VirtualizedCluster/Rules/TimesHelper.cs renamed to src/Elastic.Transport.VirtualizedCluster/Rules/TimesHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66

7-
namespace Elasticsearch.Net.VirtualizedCluster.Rules
7+
namespace Elastic.Transport.VirtualizedCluster.Rules
88
{
99
public static class TimesHelper
1010
{

src/Elasticsearch.Net.VirtualizedCluster/SealedVirtualCluster.cs renamed to src/Elastic.Transport.VirtualizedCluster/SealedVirtualCluster.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
// See the LICENSE file in the project root for more information
44

55
using System;
6-
using Elastic.Transport;
7-
using Elasticsearch.Net.VirtualizedCluster.Providers;
6+
using Elastic.Transport.VirtualizedCluster.Providers;
87

9-
namespace Elasticsearch.Net.VirtualizedCluster
8+
namespace Elastic.Transport.VirtualizedCluster
109
{
1110
public class SealedVirtualCluster
1211
{

src/Elasticsearch.Net.VirtualizedCluster/VirtualCluster.cs renamed to src/Elastic.Transport.VirtualizedCluster/VirtualCluster.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
using System.Collections.Generic;
77
using System.Collections.ObjectModel;
88
using System.Linq;
9-
using Elastic.Transport;
10-
using Elasticsearch.Net.VirtualizedCluster.Providers;
11-
using Elasticsearch.Net.VirtualizedCluster.Rules;
9+
using Elastic.Transport.VirtualizedCluster.Providers;
10+
using Elastic.Transport.VirtualizedCluster.Rules;
1211

13-
namespace Elasticsearch.Net.VirtualizedCluster
12+
namespace Elastic.Transport.VirtualizedCluster
1413
{
1514
public class VirtualCluster
1615
{

src/Elasticsearch.Net.VirtualizedCluster/VirtualClusterConnection.cs renamed to src/Elastic.Transport.VirtualizedCluster/VirtualClusterConnection.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
#endif
1414
using System.Threading;
1515
using System.Threading.Tasks;
16-
using Elastic.Transport;
17-
using Elasticsearch.Net.VirtualizedCluster.MockResponses;
18-
using Elasticsearch.Net.VirtualizedCluster.Providers;
19-
using Elasticsearch.Net.VirtualizedCluster.Rules;
16+
using Elastic.Transport.VirtualizedCluster.MockResponses;
17+
using Elastic.Transport.VirtualizedCluster.Providers;
18+
using Elastic.Transport.VirtualizedCluster.Rules;
2019

21-
namespace Elasticsearch.Net.VirtualizedCluster
20+
namespace Elastic.Transport.VirtualizedCluster
2221
{
2322
/// <summary>
2423
/// An in memory connection that uses a rule engine to return different responses for sniffs/pings and API calls.

src/Elasticsearch.Net.VirtualizedCluster/VirtualClusterWith.cs renamed to src/Elastic.Transport.VirtualizedCluster/VirtualClusterWith.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
using System;
66
using System.Collections.Generic;
77
using System.Linq;
8-
using Elastic.Transport;
98

10-
namespace Elasticsearch.Net.VirtualizedCluster
9+
namespace Elastic.Transport.VirtualizedCluster
1110
{
1211
public static class VirtualClusterWith
1312
{

src/Elasticsearch.Net.VirtualizedCluster/VirtualizedCluster.cs renamed to src/Elastic.Transport.VirtualizedCluster/VirtualizedCluster.cs

+20-14
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
using System;
66
using System.Threading;
77
using System.Threading.Tasks;
8-
using Elastic.Transport;
98
using Elastic.Transport.Products;
10-
using Elasticsearch.Net.VirtualizedCluster.Providers;
9+
using Elastic.Transport.VirtualizedCluster.Providers;
1110

12-
namespace Elasticsearch.Net.VirtualizedCluster
11+
namespace Elastic.Transport.VirtualizedCluster
1312
{
1413
public class VirtualizedCluster
1514
{
1615
private readonly FixedPipelineFactory _fixedRequestPipeline;
1716
private readonly TestableDateTimeProvider _dateTimeProvider;
1817
private readonly ConnectionConfiguration _settings;
19-
private Func<IElasticLowLevelClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, Task<ITransportResponse>> _asyncCall;
20-
private Func<IElasticLowLevelClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, ITransportResponse> _syncCall;
18+
19+
private Func<ITransport<IConnectionConfigurationValues>, Func<RequestConfigurationDescriptor, IRequestConfiguration>, Task<ITransportResponse>> _asyncCall;
20+
private Func<ITransport<IConnectionConfigurationValues>, Func<RequestConfigurationDescriptor, IRequestConfiguration>, ITransportResponse> _syncCall;
2121

2222
private class VirtualResponse : TransportResponseBase { }
2323

@@ -28,29 +28,35 @@ public VirtualizedCluster(TestableDateTimeProvider dateTimeProvider, ConnectionC
2828
//TODO this assumes Elasticsearch as product
2929
_fixedRequestPipeline = new FixedPipelineFactory(settings, _dateTimeProvider, ElasticsearchProductRegistration.Default);
3030

31-
_syncCall = (c, r) => c.Search<VirtualResponse>(PostData.Serializable(new {}), new SearchRequestParameters
31+
_syncCall = (t, r) => t.Request<VirtualResponse>(
32+
HttpMethod.GET, "/",
33+
PostData.Serializable(new {}), new RequestParameters(HttpMethod.GET, supportsBody: false)
3234
{
3335
RequestConfiguration = r?.Invoke(new RequestConfigurationDescriptor(null))
3436
});
35-
_asyncCall = async (c, r) =>
37+
_asyncCall = async (t, r) =>
3638
{
37-
var res = await c.SearchAsync<VirtualResponse>
39+
var res = await t.RequestAsync<VirtualResponse>
3840
(
41+
HttpMethod.GET, "/",
42+
CancellationToken.None,
3943
PostData.Serializable(new { }),
40-
new SearchRequestParameters { RequestConfiguration = r?.Invoke(new RequestConfigurationDescriptor(null)) },
41-
CancellationToken.None
44+
new RequestParameters(HttpMethod.GET, supportsBody: false)
45+
{
46+
RequestConfiguration = r?.Invoke(new RequestConfigurationDescriptor(null))
47+
}
4248
).ConfigureAwait(false);
4349
return (ITransportResponse)res;
4450
};
4551
}
4652

4753
public VirtualClusterConnection Connection => Client.Settings.Connection as VirtualClusterConnection;
4854
public IConnectionPool ConnectionPool => Client.Settings.ConnectionPool;
49-
public ElasticLowLevelClient Client => _fixedRequestPipeline?.Client;
55+
public ITransport<IConnectionConfigurationValues> Client => _fixedRequestPipeline?.Transport;
5056

51-
public VirtualizedCluster ClientProxiesTo(
52-
Func<IElasticLowLevelClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, ITransportResponse> sync,
53-
Func<IElasticLowLevelClient, Func<RequestConfigurationDescriptor, IRequestConfiguration>, Task<ITransportResponse>> async
57+
public VirtualizedCluster TransportProxiesTo(
58+
Func<ITransport<IConnectionConfigurationValues>, Func<RequestConfigurationDescriptor, IRequestConfiguration>, ITransportResponse> sync,
59+
Func<ITransport<IConnectionConfigurationValues>, Func<RequestConfigurationDescriptor, IRequestConfiguration>, Task<ITransportResponse>> async
5460
)
5561
{
5662
_syncCall = sync;

src/Elastic.Transport/Requests/RequestParameters.cs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace Elastic.Transport
1111

1212
public class RequestParameters : RequestParameters<RequestParameters>
1313
{
14+
//TODO these properties have nothing to do with request parameters
1415
public RequestParameters(HttpMethod method, bool supportsBody)
1516
{
1617
DefaultHttpMethod = method;

src/Elasticsearch.Net.VirtualizedCluster/Elasticsearch.Net.VirtualizedCluster.csproj

-20
This file was deleted.

tests/Tests/ClientConcepts/ConnectionPooling/BuildingBlocks/RequestPipelines.doc.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
using System.Runtime.Serialization;
1616
using Elastic.Transport.Products;
1717
using Elasticsearch.Net;
18-
using Elasticsearch.Net.VirtualizedCluster;
19-
using Elasticsearch.Net.VirtualizedCluster.Providers;
18+
using Elastic.Transport.VirtualizedCluster;
19+
using Elastic.Transport.VirtualizedCluster.Providers;
2020
using Tests.Core.Client;
2121
using Tests.Core.Client.Settings;
2222
using Tests.Framework;

tests/Tests/ClientConcepts/ConnectionPooling/Exceptions/UnexpectedExceptions.doc.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
using System.Threading.Tasks;
99
using Elastic.Elasticsearch.Xunit.XunitPlumbing;
1010
using Elastic.Transport;
11-
using Elasticsearch.Net.VirtualizedCluster;
12-
using Elasticsearch.Net.VirtualizedCluster.Audit;
11+
using Elastic.Transport.VirtualizedCluster;
12+
using Elastic.Transport.VirtualizedCluster.Audit;
1313
using FluentAssertions;
1414
using Tests.Framework;
1515
using static Elastic.Transport.Diagnostics.Auditing.AuditEvent;

tests/Tests/ClientConcepts/ConnectionPooling/Exceptions/UnrecoverableExceptions.doc.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
using Elastic.Transport;
1212
using Elastic.Transport.Extensions;
1313
using Elasticsearch.Net.Extensions;
14-
using Elasticsearch.Net.VirtualizedCluster;
15-
using Elasticsearch.Net.VirtualizedCluster.Audit;
14+
using Elastic.Transport.VirtualizedCluster;
15+
using Elastic.Transport.VirtualizedCluster.Audit;
1616
using FluentAssertions;
1717
using Nest;
1818
using Tests.Domain;
@@ -185,10 +185,6 @@ [U] public async Task BadAuthOnGetClientCallDoesNotThrowSerializationException()
185185
.ClientCalls(r => r.FailAlways(401).ReturnByteResponse(HtmlNginx401Response))
186186
.StaticConnectionPool()
187187
.Settings(s => s.DisableDirectStreaming().SkipDeserializationForStatusCodes(401))
188-
.ClientProxiesTo(
189-
(c, r) => c.Get<GetResponse<Project>>("default", "1"),
190-
async (c, r) => await c.GetAsync<GetResponse<Project>>("default-index", "1") as IResponse
191-
)
192188
);
193189

194190
audit = await audit.TraceElasticsearchException(

0 commit comments

Comments
 (0)