Skip to content

Commit 6d90436

Browse files
MpdreamzMpdreamz
committed
remove ids from querystring on multitermvector
1 parent 1477282 commit 6d90436

File tree

7 files changed

+100
-101
lines changed

7 files changed

+100
-101
lines changed

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/MultiTermVectorsDescriptorOverrides.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public IEnumerable<string> SkipQueryStringParams
1414
{
1515
return new string[]
1616
{
17+
"ids"
1718
};
1819
}
1920
}

‎src/Elasticsearch.Net/Domain/RequestParameters.Generated.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4411,16 +4411,6 @@ public MultiSearchRequestParameters SearchType(SearchTypeOptions search_type)
44114411
public class MultiTermVectorsRequestParameters : FluentRequestParameters<MultiTermVectorsRequestParameters>
44124412
{
44134413

4414-
internal string[] _ids { get; set; }
4415-
///<summary>A comma-separated list of documents ids. You must define ids as parameter or set &quot;ids&quot; or &quot;docs&quot; in the request body</summary>
4416-
public MultiTermVectorsRequestParameters Ids(params string[] ids)
4417-
{
4418-
this._ids = ids;
4419-
this.AddQueryString("ids", this._ids);
4420-
return this;
4421-
}
4422-
4423-
44244414
internal bool _term_statistics { get; set; }
44254415
///<summary>Specifies if total term frequency and document frequency should be returned. Applies to all returned documents unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.</summary>
44264416
public MultiTermVectorsRequestParameters TermStatistics(bool term_statistics)

‎src/Nest/DSL/MultiTermVectorDocumentDescriptor.cs‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
using System;
2+
using System.Linq;
3+
using System.Linq.Expressions;
4+
using Elasticsearch.Net;
5+
using Nest.Resolvers;
6+
7+
namespace Nest
8+
{
9+
public class MultiTermVectorDocumentDescriptor<T> : DocumentOptionalPathDescriptorBase<MultiTermVectorDocumentDescriptor<T>, T, MultiTermVectorsRequestParameters>, IMultiTermVectorDocumentDescriptor where T : class
10+
{
11+
12+
MultiTermVectorDocument IMultiTermVectorDocumentDescriptor.Document { get; set; }
13+
MultiTermVectorDocument IMultiTermVectorDocumentDescriptor.GetDocument()
14+
{
15+
IMultiTermVectorDocumentDescriptor d = this;
16+
if (d.Document == null) d.Document = new MultiTermVectorDocument();
17+
d.Document.Id = this._Id;
18+
d.Document.Type = this._Type;
19+
d.Document.Index = this._Index;
20+
return d.Document;
21+
}
22+
23+
private MultiTermVectorDocumentDescriptor<T> SetDocValue(Action<IMultiTermVectorDocumentDescriptor> setter)
24+
{
25+
IMultiTermVectorDocumentDescriptor d = this;
26+
if (d.Document == null) d.Document = new MultiTermVectorDocument();
27+
setter(d);
28+
return this;
29+
}
30+
31+
public MultiTermVectorDocumentDescriptor<T> Fields(params string[] fields)
32+
{
33+
return this.SetDocValue(d => d.Document.Fields = fields.Select(f => (PropertyPathMarker)f).ToList());
34+
}
35+
public MultiTermVectorDocumentDescriptor<T> Fields(params Expression<Func<T, object>>[] fields)
36+
{
37+
return this.SetDocValue(d => d.Document.Fields = fields.Select(f => (PropertyPathMarker)f).ToList());
38+
}
39+
public MultiTermVectorDocumentDescriptor<T> Fields(Func<FluentFieldList<T>, FluentFieldList<T>> fields)
40+
{
41+
return this.SetDocValue(d => d.Document.Fields = fields(new FluentFieldList<T>()).ToList());
42+
}
43+
44+
45+
public MultiTermVectorDocumentDescriptor<T> Offsets(bool offsets = true)
46+
{
47+
return this.SetDocValue(d =>d.Document.Offsets = offsets);
48+
}
49+
public MultiTermVectorDocumentDescriptor<T> Payloads(bool payloads = true)
50+
{
51+
return this.SetDocValue(d =>d.Document.Payloads = payloads);
52+
}
53+
public MultiTermVectorDocumentDescriptor<T> Positions(bool positions = true)
54+
{
55+
return this.SetDocValue(d =>d.Document.Positions = positions);
56+
}
57+
public MultiTermVectorDocumentDescriptor<T> TermStatistics(bool termStatistics = true)
58+
{
59+
return this.SetDocValue(d => d.Document.TermStatistics = termStatistics);
60+
}
61+
public MultiTermVectorDocumentDescriptor<T> FieldStatistics (bool fieldStatistics = true)
62+
{
63+
return this.SetDocValue(d => d.Document.FieldStatistics = fieldStatistics);
64+
}
65+
}
66+
}

‎src/Nest/DSL/MultiTermVectorsDescriptor.cs‎

Lines changed: 3 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Linq.Expressions;
54
using System.Text;
65
using Elasticsearch.Net;
7-
using Nest.Resolvers;
86
using Newtonsoft.Json;
97

108
namespace Nest
119
{
1210
[DescriptorFor("Mtermvectors")]
13-
public partial class MultiTermVectorsDescriptor<T> : IndexTypePathTypedDescriptor<MultiTermVectorsDescriptor<T>, MultiTermVectorsRequestParameters, T>
11+
public partial class MultiTermVectorsDescriptor<T> :
12+
IndexTypePathTypedDescriptor<MultiTermVectorsDescriptor<T>, MultiTermVectorsRequestParameters, T>
1413
, IPathInfo<MultiTermVectorsRequestParameters> where T : class
1514
{
1615
[JsonProperty("docs")]
1716
internal IEnumerable<MultiTermVectorDocument> _Documents { get; set;}
1817

18+
1919
public MultiTermVectorsDescriptor<T> Documents(params Func<MultiTermVectorDocumentDescriptor<T>, IMultiTermVectorDocumentDescriptor>[] documentSelectors)
2020
{
2121
this._Documents = documentSelectors.Select(s => s(new MultiTermVectorDocumentDescriptor<T>()).GetDocument()).Where(d=>d!= null).ToList();
@@ -36,84 +36,4 @@ public interface IMultiTermVectorDocumentDescriptor
3636
MultiTermVectorDocument Document { get; set; }
3737
MultiTermVectorDocument GetDocument();
3838
}
39-
40-
public class MultiTermVectorDocumentDescriptor<T> : DocumentOptionalPathDescriptorBase<MultiTermVectorDocumentDescriptor<T>, T, MultiTermVectorsRequestParameters>, IMultiTermVectorDocumentDescriptor where T : class
41-
{
42-
43-
MultiTermVectorDocument IMultiTermVectorDocumentDescriptor.Document { get; set; }
44-
MultiTermVectorDocument IMultiTermVectorDocumentDescriptor.GetDocument()
45-
{
46-
IMultiTermVectorDocumentDescriptor d = this;
47-
if (d.Document == null) d.Document = new MultiTermVectorDocument();
48-
d.Document.Id = this._Id;
49-
d.Document.Type = this._Type;
50-
d.Document.Index = this._Index;
51-
return d.Document;
52-
}
53-
54-
private MultiTermVectorDocumentDescriptor<T> SetDocValue(Action<IMultiTermVectorDocumentDescriptor> setter)
55-
{
56-
IMultiTermVectorDocumentDescriptor d = this;
57-
if (d.Document == null) d.Document = new MultiTermVectorDocument();
58-
setter(d);
59-
return this;
60-
}
61-
62-
public MultiTermVectorDocumentDescriptor<T> Fields(params string[] fields)
63-
{
64-
return this.SetDocValue(d => d.Document.Fields = fields.Select(f => (PropertyPathMarker)f).ToList());
65-
}
66-
public MultiTermVectorDocumentDescriptor<T> Fields(params Expression<Func<T, object>>[] fields)
67-
{
68-
return this.SetDocValue(d => d.Document.Fields = fields.Select(f => (PropertyPathMarker)f).ToList());
69-
}
70-
public MultiTermVectorDocumentDescriptor<T> Fields(Func<FluentFieldList<T>, FluentFieldList<T>> fields)
71-
{
72-
return this.SetDocValue(d => d.Document.Fields = fields(new FluentFieldList<T>()).ToList());
73-
}
74-
75-
76-
public MultiTermVectorDocumentDescriptor<T> Offsets(bool offsets = true)
77-
{
78-
return this.SetDocValue(d =>d.Document.Offsets = offsets);
79-
}
80-
public MultiTermVectorDocumentDescriptor<T> Payloads(bool payloads = true)
81-
{
82-
return this.SetDocValue(d =>d.Document.Payloads = payloads);
83-
}
84-
public MultiTermVectorDocumentDescriptor<T> Positions(bool positions = true)
85-
{
86-
return this.SetDocValue(d =>d.Document.Positions = positions);
87-
}
88-
public MultiTermVectorDocumentDescriptor<T> TermStatistics(bool termStatistics = true)
89-
{
90-
return this.SetDocValue(d => d.Document.TermStatistics = termStatistics);
91-
}
92-
public MultiTermVectorDocumentDescriptor<T> FieldStatistics (bool fieldStatistics = true)
93-
{
94-
return this.SetDocValue(d => d.Document.FieldStatistics = fieldStatistics);
95-
}
96-
}
97-
98-
public class MultiTermVectorDocument
99-
{
100-
[JsonProperty("_index")]
101-
public IndexNameMarker Index { get; set; }
102-
[JsonProperty("_type")]
103-
public TypeNameMarker Type { get; set; }
104-
[JsonProperty("_id")]
105-
public string Id { get; set; }
106-
[JsonProperty("fields")]
107-
public IEnumerable<PropertyPathMarker> Fields { get; set; }
108-
[JsonProperty("offsets")]
109-
public bool? Offsets { get; set; }
110-
[JsonProperty("payloads")]
111-
public bool? Payloads { get; set; }
112-
[JsonProperty("positions")]
113-
public bool? Positions { get; set; }
114-
[JsonProperty("term_statistics")]
115-
public bool? TermStatistics { get; set; }
116-
[JsonProperty("field_statistics")]
117-
public bool? FieldStatistics { get; set; }
118-
}
11939
}

‎src/Nest/DSL/_Descriptors.generated.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4078,14 +4078,6 @@ public partial class MultiTermVectorsDescriptor<T>
40784078
internal MultiTermVectorsRequestParameters _QueryString = new MultiTermVectorsRequestParameters();
40794079

40804080

4081-
///<summary>A comma-separated list of documents ids. You must define ids as parameter or set &quot;ids&quot; or &quot;docs&quot; in the request body</summary>
4082-
public MultiTermVectorsDescriptor<T> Ids(params string[] ids)
4083-
{
4084-
this._QueryString.Ids(ids);
4085-
return this;
4086-
}
4087-
4088-
40894081
///<summary>Specifies if total term frequency and document frequency should be returned. Applies to all returned documents unless otherwise specified in body &quot;params&quot; or &quot;docs&quot;.</summary>
40904082
public MultiTermVectorsDescriptor<T> TermStatistics(bool term_statistics = true)
40914083
{

‎src/Nest/Domain/TermVector/MultiTermVectorDocument.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System.Collections.Generic;
2+
using Nest.Resolvers;
3+
using Newtonsoft.Json;
4+
5+
namespace Nest
6+
{
7+
public class MultiTermVectorDocument
8+
{
9+
[JsonProperty("_index")]
10+
public IndexNameMarker Index { get; set; }
11+
[JsonProperty("_type")]
12+
public TypeNameMarker Type { get; set; }
13+
[JsonProperty("_id")]
14+
public string Id { get; set; }
15+
[JsonProperty("fields")]
16+
public IEnumerable<PropertyPathMarker> Fields { get; set; }
17+
[JsonProperty("offsets")]
18+
public bool? Offsets { get; set; }
19+
[JsonProperty("payloads")]
20+
public bool? Payloads { get; set; }
21+
[JsonProperty("positions")]
22+
public bool? Positions { get; set; }
23+
[JsonProperty("term_statistics")]
24+
public bool? TermStatistics { get; set; }
25+
[JsonProperty("field_statistics")]
26+
public bool? FieldStatistics { get; set; }
27+
}
28+
}

‎src/Nest/Nest.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@
141141
<Compile Include="Domain\Responses\SnapshotResponse.cs" />
142142
<Compile Include="DSL\DeleteSnapshotDescriptor.cs" />
143143
<Compile Include="DSL\GetSnapshotDescriptor.cs" />
144+
<Compile Include="Domain\TermVector\MultiTermVectorDocument.cs" />
145+
<Compile Include="DSL\MultiTermVectorDocumentDescriptor.cs" />
144146
<Compile Include="DSL\MultiTermVectorsDescriptor.cs" />
145147
<Compile Include="DSL\Paths\DocumentOptionalPathDescriptor.cs" />
146148
<Compile Include="DSL\RestoreDescriptor.cs" />

0 commit comments

Comments
 (0)