Skip to content

Commit 9f69f5f

Browse files
committed
get pipeline api is now dictionary based as per elastic/elasticsearch#19685
1 parent 88d82c2 commit 9f69f5f

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

src/Nest/Ingest/GetPipeline/GetPipelineResponse.cs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,14 @@ namespace Nest
99
public interface IGetPipelineResponse : IResponse
1010
{
1111
[JsonProperty("pipelines")]
12-
List<PipelineInfo> Pipelines { get; }
12+
IDictionary<string, IPipeline> Pipelines { get; }
1313
}
1414

15-
public class GetPipelineResponse : ResponseBase, IGetPipelineResponse
15+
[JsonConverter(typeof(DictionaryResponseJsonConverter<GetPipelineResponse, string, IPipeline>))]
16+
public class GetPipelineResponse : DictionaryResponseBase<string, IPipeline>, IGetPipelineResponse
1617
{
17-
public List<PipelineInfo> Pipelines { get; internal set; }
18+
[JsonIgnore]
19+
public IDictionary<string, IPipeline> Pipelines => Self.BackingDictionary;
1820
}
1921

20-
[JsonObject(MemberSerialization.OptIn)]
21-
public class PipelineInfo
22-
{
23-
[JsonProperty("id")]
24-
public string Id { get; internal set; }
25-
26-
[JsonProperty("config")]
27-
public Pipeline Config { get; internal set; }
28-
}
2922
}

src/Tests/Ingest/PipelineCrudTests.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ protected override void ExpectAfterCreate(IGetPipelineResponse response)
3030
{
3131
response.Pipelines.Should().NotBeNull().And.HaveCount(1);
3232

33-
var pipeline = response.Pipelines.First();
34-
pipeline.Config.Should().NotBeNull();
35-
pipeline.Id.Should().NotBeNullOrEmpty();
33+
var kv = response.Pipelines.First();
34+
kv.Should().NotBeNull();
35+
kv.Key.Should().NotBeNullOrWhiteSpace();
3636

37-
var processors = pipeline.Config.Processors;
37+
var pipeline = kv.Value;
38+
pipeline.Description.Should().NotBeNull();
39+
40+
var processors = pipeline.Processors;
3841
processors.Should().NotBeNull().And.HaveCount(2);
3942

4043
var uppercase = processors.Where(p => p.Name == "uppercase").FirstOrDefault() as UppercaseProcessor;
@@ -140,11 +143,14 @@ protected override void ExpectAfterUpdate(IGetPipelineResponse response)
140143
{
141144
response.Pipelines.Should().NotBeNull().And.HaveCount(1);
142145

143-
var pipeline = response.Pipelines.First();
144-
pipeline.Config.Should().NotBeNull();
145-
pipeline.Id.Should().NotBeNullOrEmpty();
146+
var kv = response.Pipelines.First();
147+
kv.Should().NotBeNull();
148+
kv.Key.Should().NotBeNullOrWhiteSpace();
149+
150+
var pipeline = kv.Value;
151+
pipeline.Should().NotBeNull();
146152

147-
var processors = pipeline.Config.Processors;
153+
var processors = pipeline.Processors;
148154
processors.Should().NotBeNull().And.HaveCount(3);
149155

150156
var uppercase = processors.Where(p => p.Name == "uppercase").FirstOrDefault() as UppercaseProcessor;

0 commit comments

Comments
 (0)