Skip to content

Commit 4a9002a

Browse files
committed
refactored snapshot/repository/restore argument order, provided xml docs for all the newly added operations to IElasticClient
1 parent 68d7a1a commit 4a9002a

File tree

7 files changed

+239
-114
lines changed

7 files changed

+239
-114
lines changed

src/Nest/ElasticClient-Repository.cs

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -51,85 +51,5 @@ public Task<IAcknowledgedResponse> DeleteRepositoryAsync(string name, Func<Delet
5151
);
5252
}
5353

54-
public ISnapshotResponse Snapshot(string name, string repository, Func<SnapshotDescriptor, SnapshotDescriptor> selector = null)
55-
{
56-
name.ThrowIfNullOrEmpty("name");
57-
repository.ThrowIfNullOrEmpty("repository");
58-
selector = selector ?? (s => s);
59-
return this.Dispatch<SnapshotDescriptor, SnapshotRequestParameters, SnapshotResponse>(
60-
s => selector(s.Snapshot(name).Repository(repository)),
61-
(p, d) => this.RawDispatch.SnapshotCreateDispatch<SnapshotResponse>(p, d)
62-
);
63-
}
64-
public Task<ISnapshotResponse> SnapshotAsync(string name, string repository, Func<SnapshotDescriptor, SnapshotDescriptor> selector = null)
65-
{
66-
name.ThrowIfNullOrEmpty("name");
67-
repository.ThrowIfNullOrEmpty("repository");
68-
selector = selector ?? (s => s);
69-
return this.DispatchAsync<SnapshotDescriptor, SnapshotRequestParameters, SnapshotResponse, ISnapshotResponse>(
70-
s => selector(s.Snapshot(name).Repository(repository)),
71-
(p, d) => this.RawDispatch.SnapshotCreateDispatchAsync<SnapshotResponse>(p, d)
72-
);
73-
}
74-
public IGetSnapshotResponse GetSnapshot(string name, string repository, Func<GetSnapshotDescriptor, GetSnapshotDescriptor> selector = null)
75-
{
76-
name.ThrowIfNullOrEmpty("name");
77-
repository.ThrowIfNullOrEmpty("repository");
78-
selector = selector ?? (s => s);
79-
return this.Dispatch<GetSnapshotDescriptor, GetSnapshotRequestParameters, GetSnapshotResponse>(
80-
s => selector(s.Snapshot(name).Repository(repository)),
81-
(p, d) => this.RawDispatch.SnapshotGetDispatch<GetSnapshotResponse>(p)
82-
);
83-
}
84-
public Task<IGetSnapshotResponse> GetSnapshotAsync(string name, string repository, Func<GetSnapshotDescriptor, GetSnapshotDescriptor> selector = null)
85-
{
86-
name.ThrowIfNullOrEmpty("name");
87-
repository.ThrowIfNullOrEmpty("repository");
88-
selector = selector ?? (s => s);
89-
return this.DispatchAsync<GetSnapshotDescriptor, GetSnapshotRequestParameters, GetSnapshotResponse, IGetSnapshotResponse>(
90-
s => selector(s.Snapshot(name).Repository(repository)),
91-
(p, d) => this.RawDispatch.SnapshotGetDispatchAsync<GetSnapshotResponse>(p)
92-
);
93-
}
94-
public IAcknowledgedResponse DeleteSnapshot(string name, string repository, Func<DeleteSnapshotDescriptor, DeleteSnapshotDescriptor> selector = null)
95-
{
96-
name.ThrowIfNullOrEmpty("name");
97-
repository.ThrowIfNullOrEmpty("repository");
98-
selector = selector ?? (s => s);
99-
return this.Dispatch<DeleteSnapshotDescriptor, DeleteSnapshotRequestParameters, AcknowledgedResponse>(
100-
s => selector(s.Snapshot(name).Repository(repository)),
101-
(p, d) => this.RawDispatch.SnapshotDeleteDispatch<AcknowledgedResponse>(p)
102-
);
103-
}
104-
public Task<IAcknowledgedResponse> DeleteSnapshotAsync(string name, string repository, Func<DeleteSnapshotDescriptor, DeleteSnapshotDescriptor> selector = null)
105-
{
106-
name.ThrowIfNullOrEmpty("name");
107-
repository.ThrowIfNullOrEmpty("repository");
108-
selector = selector ?? (s => s);
109-
return this.DispatchAsync<DeleteSnapshotDescriptor, DeleteSnapshotRequestParameters, AcknowledgedResponse, IAcknowledgedResponse>(
110-
s => selector(s.Snapshot(name).Repository(repository)),
111-
(p, d) => this.RawDispatch.SnapshotDeleteDispatchAsync<AcknowledgedResponse>(p)
112-
);
113-
}
114-
public IAcknowledgedResponse Restore(string name, string repository, Func<RestoreDescriptor, RestoreDescriptor> selector = null)
115-
{
116-
name.ThrowIfNullOrEmpty("name");
117-
repository.ThrowIfNullOrEmpty("repository");
118-
selector = selector ?? (s => s);
119-
return this.Dispatch<RestoreDescriptor, RestoreRequestParameters, AcknowledgedResponse>(
120-
s => selector(s.Snapshot(name).Repository(repository)),
121-
(p, d) => this.RawDispatch.SnapshotRestoreDispatch<AcknowledgedResponse>(p, d)
122-
);
123-
}
124-
public Task<IAcknowledgedResponse> RestoreAsync(string name, string repository, Func<RestoreDescriptor, RestoreDescriptor> selector = null)
125-
{
126-
name.ThrowIfNullOrEmpty("name");
127-
repository.ThrowIfNullOrEmpty("repository");
128-
selector = selector ?? (s => s);
129-
return this.DispatchAsync<RestoreDescriptor, RestoreRequestParameters, AcknowledgedResponse, IAcknowledgedResponse>(
130-
s => selector(s.Snapshot(name).Repository(repository)),
131-
(p, d) => this.RawDispatch.SnapshotRestoreDispatchAsync<AcknowledgedResponse>(p, d)
132-
);
133-
}
13454
}
13555
}

src/Nest/ElasticClient-Restore.cs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Deployment.Internal;
4+
using System.Linq;
5+
using System.Threading.Tasks;
6+
using Elasticsearch.Net;
7+
8+
namespace Nest
9+
{
10+
public partial class ElasticClient
11+
{
12+
/// <inheritdoc />
13+
public IAcknowledgedResponse Restore(string repository, string snapshotName, Func<RestoreDescriptor, RestoreDescriptor> selector = null)
14+
{
15+
snapshotName.ThrowIfNullOrEmpty("name");
16+
repository.ThrowIfNullOrEmpty("repository");
17+
selector = selector ?? (s => s);
18+
return this.Dispatch<RestoreDescriptor, RestoreRequestParameters, AcknowledgedResponse>(
19+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
20+
(p, d) => this.RawDispatch.SnapshotRestoreDispatch<AcknowledgedResponse>(p, d)
21+
);
22+
}
23+
24+
/// <inheritdoc />
25+
public Task<IAcknowledgedResponse> RestoreAsync(string repository, string snapshotName, Func<RestoreDescriptor, RestoreDescriptor> selector = null)
26+
{
27+
snapshotName.ThrowIfNullOrEmpty("name");
28+
repository.ThrowIfNullOrEmpty("repository");
29+
selector = selector ?? (s => s);
30+
return this.DispatchAsync<RestoreDescriptor, RestoreRequestParameters, AcknowledgedResponse, IAcknowledgedResponse>(
31+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
32+
(p, d) => this.RawDispatch.SnapshotRestoreDispatchAsync<AcknowledgedResponse>(p, d)
33+
);
34+
}
35+
}
36+
}

src/Nest/ElasticClient-Snapshot.cs

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Deployment.Internal;
4+
using System.Linq;
5+
using System.Threading.Tasks;
6+
using Elasticsearch.Net;
7+
8+
namespace Nest
9+
{
10+
public partial class ElasticClient
11+
{
12+
/// <inheritdoc />
13+
public ISnapshotResponse Snapshot(string repository, string snapshotName, Func<SnapshotDescriptor, SnapshotDescriptor> selector = null)
14+
{
15+
snapshotName.ThrowIfNullOrEmpty("name");
16+
repository.ThrowIfNullOrEmpty("repository");
17+
selector = selector ?? (s => s);
18+
return this.Dispatch<SnapshotDescriptor, SnapshotRequestParameters, SnapshotResponse>(
19+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
20+
(p, d) => this.RawDispatch.SnapshotCreateDispatch<SnapshotResponse>(p, d)
21+
);
22+
}
23+
/// <inheritdoc />
24+
public Task<ISnapshotResponse> SnapshotAsync(string repository, string snapshotName, Func<SnapshotDescriptor, SnapshotDescriptor> selector = null)
25+
{
26+
snapshotName.ThrowIfNullOrEmpty("name");
27+
repository.ThrowIfNullOrEmpty("repository");
28+
selector = selector ?? (s => s);
29+
return this.DispatchAsync<SnapshotDescriptor, SnapshotRequestParameters, SnapshotResponse, ISnapshotResponse>(
30+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
31+
(p, d) => this.RawDispatch.SnapshotCreateDispatchAsync<SnapshotResponse>(p, d)
32+
);
33+
}
34+
/// <inheritdoc />
35+
public IGetSnapshotResponse GetSnapshot(string repository, string snapshotName, Func<GetSnapshotDescriptor, GetSnapshotDescriptor> selector = null)
36+
{
37+
snapshotName.ThrowIfNullOrEmpty("name");
38+
repository.ThrowIfNullOrEmpty("repository");
39+
selector = selector ?? (s => s);
40+
return this.Dispatch<GetSnapshotDescriptor, GetSnapshotRequestParameters, GetSnapshotResponse>(
41+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
42+
(p, d) => this.RawDispatch.SnapshotGetDispatch<GetSnapshotResponse>(p)
43+
);
44+
}
45+
/// <inheritdoc />
46+
public Task<IGetSnapshotResponse> GetSnapshotAsync(string repository, string snapshotName, Func<GetSnapshotDescriptor, GetSnapshotDescriptor> selector = null)
47+
{
48+
snapshotName.ThrowIfNullOrEmpty("name");
49+
repository.ThrowIfNullOrEmpty("repository");
50+
selector = selector ?? (s => s);
51+
return this.DispatchAsync<GetSnapshotDescriptor, GetSnapshotRequestParameters, GetSnapshotResponse, IGetSnapshotResponse>(
52+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
53+
(p, d) => this.RawDispatch.SnapshotGetDispatchAsync<GetSnapshotResponse>(p)
54+
);
55+
}
56+
/// <inheritdoc />
57+
public IAcknowledgedResponse DeleteSnapshot(string repository, string snapshotName, Func<DeleteSnapshotDescriptor, DeleteSnapshotDescriptor> selector = null)
58+
{
59+
snapshotName.ThrowIfNullOrEmpty("name");
60+
repository.ThrowIfNullOrEmpty("repository");
61+
selector = selector ?? (s => s);
62+
return this.Dispatch<DeleteSnapshotDescriptor, DeleteSnapshotRequestParameters, AcknowledgedResponse>(
63+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
64+
(p, d) => this.RawDispatch.SnapshotDeleteDispatch<AcknowledgedResponse>(p)
65+
);
66+
}
67+
/// <inheritdoc />
68+
public Task<IAcknowledgedResponse> DeleteSnapshotAsync(string repository, string snapshotName, Func<DeleteSnapshotDescriptor, DeleteSnapshotDescriptor> selector = null)
69+
{
70+
snapshotName.ThrowIfNullOrEmpty("name");
71+
repository.ThrowIfNullOrEmpty("repository");
72+
selector = selector ?? (s => s);
73+
return this.DispatchAsync<DeleteSnapshotDescriptor, DeleteSnapshotRequestParameters, AcknowledgedResponse, IAcknowledgedResponse>(
74+
s => selector(s.Snapshot(snapshotName).Repository(repository)),
75+
(p, d) => this.RawDispatch.SnapshotDeleteDispatchAsync<AcknowledgedResponse>(p)
76+
);
77+
}
78+
79+
}
80+
}

0 commit comments

Comments
 (0)