Skip to content

Commit 422f2d5

Browse files
committed
LowLevelDispatch no longer part of code generation
1 parent f126f34 commit 422f2d5

File tree

5 files changed

+1
-140
lines changed

5 files changed

+1
-140
lines changed

src/CodeGeneration/ApiGenerator/ApiGenerator.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public static void Generate(string downloadBranch, params string[] folders)
3131
{ GenerateRequests, "Requests" },
3232
{ GenerateEnums, "Enums" },
3333
{ GenerateRawClient, "Lowlevel client" },
34-
{ GenerateRawDispatch, "Dispatch" },
3534
};
3635

3736
using (var pbar = new ProgressBar(actions.Count, "Generating code", new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
@@ -181,14 +180,6 @@ private static void GenerateClientInterface(RestApiSpec model)
181180
File.WriteAllText(targetFile, source);
182181
}
183182

184-
private static void GenerateRawDispatch(RestApiSpec model)
185-
{
186-
var targetFile = CodeConfiguration.NestFolder + @"_Generated/_LowLevelDispatch.Generated.cs";
187-
var source = DoRazor(nameof(GenerateRawDispatch), File.ReadAllText(CodeConfiguration.ViewFolder + @"_LowLevelDispatch.Generated.cshtml"),
188-
model);
189-
File.WriteAllText(targetFile, source);
190-
}
191-
192183
private static void GenerateRawClient(RestApiSpec model)
193184
{
194185
var targetFile = CodeConfiguration.EsNetFolder + @"ElasticLowLevelClient.Generated.cs";

src/CodeGeneration/ApiGenerator/Views/_LowLevelDispatch.Generated.cshtml

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

src/Elasticsearch.Net/Serialization/ElasticsearchUrlFormatter.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ public string Format(string format, object arg, IFormatProvider formatProvider)
2626

2727
public object GetFormat(Type formatType) => formatType == typeof(ICustomFormatter) ? this : null;
2828

29-
public string CreateEscapedString(object value)
30-
{
31-
var r = CreateString(value, _settings);
32-
return r.IsNullOrEmpty() ? string.Empty : Uri.EscapeDataString(r);
33-
}
34-
3529
public string CreateString(object value) => CreateString(value, _settings);
3630

3731
public static string CreateString(object value, IConnectionConfigurationValues settings)

src/Nest/CommonAbstractions/Request/RequestBase.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ protected RequestBase(Func<RouteValues, RouteValues> pathSelector)
5656

5757
IRequestParameters IRequest.RequestParametersInternal => RequestState.RequestParameters;
5858

59+
// TODO remove this is only used to make sure requests set typed_keys automatically, find better approach for this
5960
protected virtual void Initialize() { }
6061

6162
protected TOut Q<TOut>(string name) => RequestState.RequestParameters.GetQueryStringValue<TOut>(name);
@@ -93,13 +94,8 @@ public abstract partial class RequestDescriptorBase<TDescriptor, TParameters, TI
9394

9495
protected RequestDescriptorBase(Func<RouteValues, RouteValues> pathSelector) : base(pathSelector) => _descriptor = (TDescriptor)this;
9596

96-
protected IRequestConfiguration RequestConfig => ((IRequestParameters)RequestState.RequestParameters).RequestConfiguration;
97-
9897
protected TInterface Self => _descriptor;
9998

100-
[Obsolete("Use the overload that accepts TValue")]
101-
protected TDescriptor Assign(Action<TInterface> assign) => Fluent.Assign(_descriptor, assign);
102-
10399
protected TDescriptor Assign<TValue>(TValue value, Action<TInterface, TValue> assign) => Fluent.Assign(_descriptor, value, assign);
104100

105101
protected TDescriptor AssignParam(Action<TParameters> assigner)

src/Nest/ElasticClient.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public ElasticClient(ITransport<IConnectionSettingsValues> transport)
2727

2828
Transport = transport;
2929
LowLevel = new ElasticLowLevelClient(Transport);
30-
LowLevelDispatch = new LowLevelDispatch(LowLevel);
3130
}
3231

3332
public IConnectionSettingsValues ConnectionSettings => Transport.Settings;
@@ -38,8 +37,6 @@ public ElasticClient(ITransport<IConnectionSettingsValues> transport)
3837

3938
public IElasticsearchSerializer SourceSerializer => Transport.Settings.SourceSerializer;
4039

41-
private LowLevelDispatch LowLevelDispatch { get; }
42-
4340
private ITransport<IConnectionSettingsValues> Transport { get; }
4441

4542
internal TResponse DoRequest<TRequest, TResponse>(TRequest p, IRequestParameters parameters, Action<IRequestConfiguration> forceConfiguration = null)

0 commit comments

Comments
 (0)