Skip to content

Commit 52c123e

Browse files
hub-caphub-cap
committed
HLRC: split snapshot request converters (#33439)
In an effort to encapsulate the different clients, the request converters are being shuffled around. This splits the SnapshotClient request converters.
1 parent 239c888 commit 52c123e

File tree

5 files changed

+459
-385
lines changed

5 files changed

+459
-385
lines changed

‎client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java‎

Lines changed: 0 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@
3030
import org.apache.lucene.util.BytesRef;
3131
import org.elasticsearch.action.DocWriteRequest;
3232
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
33-
import org.elasticsearch.action.admin.cluster.repositories.delete.DeleteRepositoryRequest;
34-
import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesRequest;
35-
import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest;
36-
import org.elasticsearch.action.admin.cluster.repositories.verify.VerifyRepositoryRequest;
37-
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequest;
38-
import org.elasticsearch.action.admin.cluster.snapshots.delete.DeleteSnapshotRequest;
39-
import org.elasticsearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
40-
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
41-
import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest;
4233
import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest;
4334
import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptRequest;
4435
import org.elasticsearch.action.admin.cluster.storedscripts.PutStoredScriptRequest;
@@ -905,126 +896,6 @@ static Request indexPutSettings(UpdateSettingsRequest updateSettingsRequest) thr
905896
return request;
906897
}
907898

908-
static Request getRepositories(GetRepositoriesRequest getRepositoriesRequest) {
909-
String[] repositories = getRepositoriesRequest.repositories() == null ? Strings.EMPTY_ARRAY : getRepositoriesRequest.repositories();
910-
String endpoint = new EndpointBuilder().addPathPartAsIs("_snapshot").addCommaSeparatedPathParts(repositories).build();
911-
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
912-
913-
Params parameters = new Params(request);
914-
parameters.withMasterTimeout(getRepositoriesRequest.masterNodeTimeout());
915-
parameters.withLocal(getRepositoriesRequest.local());
916-
return request;
917-
}
918-
919-
static Request createRepository(PutRepositoryRequest putRepositoryRequest) throws IOException {
920-
String endpoint = new EndpointBuilder().addPathPart("_snapshot").addPathPart(putRepositoryRequest.name()).build();
921-
Request request = new Request(HttpPut.METHOD_NAME, endpoint);
922-
923-
Params parameters = new Params(request);
924-
parameters.withMasterTimeout(putRepositoryRequest.masterNodeTimeout());
925-
parameters.withTimeout(putRepositoryRequest.timeout());
926-
parameters.withVerify(putRepositoryRequest.verify());
927-
928-
request.setEntity(createEntity(putRepositoryRequest, REQUEST_BODY_CONTENT_TYPE));
929-
return request;
930-
}
931-
932-
static Request deleteRepository(DeleteRepositoryRequest deleteRepositoryRequest) {
933-
String endpoint = new EndpointBuilder().addPathPartAsIs("_snapshot").addPathPart(deleteRepositoryRequest.name()).build();
934-
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
935-
936-
Params parameters = new Params(request);
937-
parameters.withMasterTimeout(deleteRepositoryRequest.masterNodeTimeout());
938-
parameters.withTimeout(deleteRepositoryRequest.timeout());
939-
return request;
940-
}
941-
942-
static Request verifyRepository(VerifyRepositoryRequest verifyRepositoryRequest) {
943-
String endpoint = new EndpointBuilder().addPathPartAsIs("_snapshot")
944-
.addPathPart(verifyRepositoryRequest.name())
945-
.addPathPartAsIs("_verify")
946-
.build();
947-
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
948-
949-
Params parameters = new Params(request);
950-
parameters.withMasterTimeout(verifyRepositoryRequest.masterNodeTimeout());
951-
parameters.withTimeout(verifyRepositoryRequest.timeout());
952-
return request;
953-
}
954-
955-
static Request createSnapshot(CreateSnapshotRequest createSnapshotRequest) throws IOException {
956-
String endpoint = new EndpointBuilder().addPathPart("_snapshot")
957-
.addPathPart(createSnapshotRequest.repository())
958-
.addPathPart(createSnapshotRequest.snapshot())
959-
.build();
960-
Request request = new Request(HttpPut.METHOD_NAME, endpoint);
961-
Params params = new Params(request);
962-
params.withMasterTimeout(createSnapshotRequest.masterNodeTimeout());
963-
params.withWaitForCompletion(createSnapshotRequest.waitForCompletion());
964-
request.setEntity(createEntity(createSnapshotRequest, REQUEST_BODY_CONTENT_TYPE));
965-
return request;
966-
}
967-
968-
static Request getSnapshots(GetSnapshotsRequest getSnapshotsRequest) {
969-
EndpointBuilder endpointBuilder = new EndpointBuilder().addPathPartAsIs("_snapshot")
970-
.addPathPart(getSnapshotsRequest.repository());
971-
String endpoint;
972-
if (getSnapshotsRequest.snapshots().length == 0) {
973-
endpoint = endpointBuilder.addPathPart("_all").build();
974-
} else {
975-
endpoint = endpointBuilder.addCommaSeparatedPathParts(getSnapshotsRequest.snapshots()).build();
976-
}
977-
978-
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
979-
980-
Params parameters = new Params(request);
981-
parameters.withMasterTimeout(getSnapshotsRequest.masterNodeTimeout());
982-
parameters.putParam("ignore_unavailable", Boolean.toString(getSnapshotsRequest.ignoreUnavailable()));
983-
parameters.putParam("verbose", Boolean.toString(getSnapshotsRequest.verbose()));
984-
985-
return request;
986-
}
987-
988-
static Request snapshotsStatus(SnapshotsStatusRequest snapshotsStatusRequest) {
989-
String endpoint = new EndpointBuilder().addPathPartAsIs("_snapshot")
990-
.addPathPart(snapshotsStatusRequest.repository())
991-
.addCommaSeparatedPathParts(snapshotsStatusRequest.snapshots())
992-
.addPathPartAsIs("_status")
993-
.build();
994-
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
995-
996-
Params parameters = new Params(request);
997-
parameters.withMasterTimeout(snapshotsStatusRequest.masterNodeTimeout());
998-
parameters.withIgnoreUnavailable(snapshotsStatusRequest.ignoreUnavailable());
999-
return request;
1000-
}
1001-
1002-
static Request restoreSnapshot(RestoreSnapshotRequest restoreSnapshotRequest) throws IOException {
1003-
String endpoint = new EndpointBuilder().addPathPartAsIs("_snapshot")
1004-
.addPathPart(restoreSnapshotRequest.repository())
1005-
.addPathPart(restoreSnapshotRequest.snapshot())
1006-
.addPathPartAsIs("_restore")
1007-
.build();
1008-
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
1009-
Params parameters = new Params(request);
1010-
parameters.withMasterTimeout(restoreSnapshotRequest.masterNodeTimeout());
1011-
parameters.withWaitForCompletion(restoreSnapshotRequest.waitForCompletion());
1012-
request.setEntity(createEntity(restoreSnapshotRequest, REQUEST_BODY_CONTENT_TYPE));
1013-
return request;
1014-
}
1015-
1016-
static Request deleteSnapshot(DeleteSnapshotRequest deleteSnapshotRequest) {
1017-
String endpoint = new EndpointBuilder().addPathPartAsIs("_snapshot")
1018-
.addPathPart(deleteSnapshotRequest.repository())
1019-
.addPathPart(deleteSnapshotRequest.snapshot())
1020-
.build();
1021-
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
1022-
1023-
Params parameters = new Params(request);
1024-
parameters.withMasterTimeout(deleteSnapshotRequest.masterNodeTimeout());
1025-
return request;
1026-
}
1027-
1028899
static Request putTemplate(PutIndexTemplateRequest putIndexTemplateRequest) throws IOException {
1029900
String endpoint = new EndpointBuilder().addPathPartAsIs("_template").addPathPart(putIndexTemplateRequest.name()).build();
1030901
Request request = new Request(HttpPut.METHOD_NAME, endpoint);

‎client/rest-high-level/src/main/java/org/elasticsearch/client/SnapshotClient.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public final class SnapshotClient {
6565
*/
6666
public GetRepositoriesResponse getRepository(GetRepositoriesRequest getRepositoriesRequest, RequestOptions options)
6767
throws IOException {
68-
return restHighLevelClient.performRequestAndParseEntity(getRepositoriesRequest, RequestConverters::getRepositories, options,
68+
return restHighLevelClient.performRequestAndParseEntity(getRepositoriesRequest, SnapshotRequestConverters::getRepositories, options,
6969
GetRepositoriesResponse::fromXContent, emptySet());
7070
}
7171

@@ -80,7 +80,7 @@ public GetRepositoriesResponse getRepository(GetRepositoriesRequest getRepositor
8080
*/
8181
public void getRepositoryAsync(GetRepositoriesRequest getRepositoriesRequest, RequestOptions options,
8282
ActionListener<GetRepositoriesResponse> listener) {
83-
restHighLevelClient.performRequestAsyncAndParseEntity(getRepositoriesRequest, RequestConverters::getRepositories, options,
83+
restHighLevelClient.performRequestAsyncAndParseEntity(getRepositoriesRequest, SnapshotRequestConverters::getRepositories, options,
8484
GetRepositoriesResponse::fromXContent, listener, emptySet());
8585
}
8686

@@ -94,7 +94,7 @@ public void getRepositoryAsync(GetRepositoriesRequest getRepositoriesRequest, Re
9494
* @throws IOException in case there is a problem sending the request or parsing back the response
9595
*/
9696
public AcknowledgedResponse createRepository(PutRepositoryRequest putRepositoryRequest, RequestOptions options) throws IOException {
97-
return restHighLevelClient.performRequestAndParseEntity(putRepositoryRequest, RequestConverters::createRepository, options,
97+
return restHighLevelClient.performRequestAndParseEntity(putRepositoryRequest, SnapshotRequestConverters::createRepository, options,
9898
AcknowledgedResponse::fromXContent, emptySet());
9999
}
100100

@@ -108,7 +108,7 @@ public AcknowledgedResponse createRepository(PutRepositoryRequest putRepositoryR
108108
*/
109109
public void createRepositoryAsync(PutRepositoryRequest putRepositoryRequest, RequestOptions options,
110110
ActionListener<AcknowledgedResponse> listener) {
111-
restHighLevelClient.performRequestAsyncAndParseEntity(putRepositoryRequest, RequestConverters::createRepository, options,
111+
restHighLevelClient.performRequestAsyncAndParseEntity(putRepositoryRequest, SnapshotRequestConverters::createRepository, options,
112112
AcknowledgedResponse::fromXContent, listener, emptySet());
113113
}
114114

@@ -123,8 +123,8 @@ public void createRepositoryAsync(PutRepositoryRequest putRepositoryRequest, Req
123123
*/
124124
public AcknowledgedResponse deleteRepository(DeleteRepositoryRequest deleteRepositoryRequest, RequestOptions options)
125125
throws IOException {
126-
return restHighLevelClient.performRequestAndParseEntity(deleteRepositoryRequest, RequestConverters::deleteRepository, options,
127-
AcknowledgedResponse::fromXContent, emptySet());
126+
return restHighLevelClient.performRequestAndParseEntity(deleteRepositoryRequest, SnapshotRequestConverters::deleteRepository,
127+
options, AcknowledgedResponse::fromXContent, emptySet());
128128
}
129129

130130
/**
@@ -137,7 +137,7 @@ public AcknowledgedResponse deleteRepository(DeleteRepositoryRequest deleteRepos
137137
*/
138138
public void deleteRepositoryAsync(DeleteRepositoryRequest deleteRepositoryRequest, RequestOptions options,
139139
ActionListener<AcknowledgedResponse> listener) {
140-
restHighLevelClient.performRequestAsyncAndParseEntity(deleteRepositoryRequest, RequestConverters::deleteRepository, options,
140+
restHighLevelClient.performRequestAsyncAndParseEntity(deleteRepositoryRequest, SnapshotRequestConverters::deleteRepository, options,
141141
AcknowledgedResponse::fromXContent, listener, emptySet());
142142
}
143143

@@ -152,8 +152,8 @@ public void deleteRepositoryAsync(DeleteRepositoryRequest deleteRepositoryReques
152152
*/
153153
public VerifyRepositoryResponse verifyRepository(VerifyRepositoryRequest verifyRepositoryRequest, RequestOptions options)
154154
throws IOException {
155-
return restHighLevelClient.performRequestAndParseEntity(verifyRepositoryRequest, RequestConverters::verifyRepository, options,
156-
VerifyRepositoryResponse::fromXContent, emptySet());
155+
return restHighLevelClient.performRequestAndParseEntity(verifyRepositoryRequest, SnapshotRequestConverters::verifyRepository,
156+
options, VerifyRepositoryResponse::fromXContent, emptySet());
157157
}
158158

159159
/**
@@ -166,7 +166,7 @@ public VerifyRepositoryResponse verifyRepository(VerifyRepositoryRequest verifyR
166166
*/
167167
public void verifyRepositoryAsync(VerifyRepositoryRequest verifyRepositoryRequest, RequestOptions options,
168168
ActionListener<VerifyRepositoryResponse> listener) {
169-
restHighLevelClient.performRequestAsyncAndParseEntity(verifyRepositoryRequest, RequestConverters::verifyRepository, options,
169+
restHighLevelClient.performRequestAsyncAndParseEntity(verifyRepositoryRequest, SnapshotRequestConverters::verifyRepository, options,
170170
VerifyRepositoryResponse::fromXContent, listener, emptySet());
171171
}
172172

@@ -178,7 +178,7 @@ public void verifyRepositoryAsync(VerifyRepositoryRequest verifyRepositoryReques
178178
*/
179179
public CreateSnapshotResponse create(CreateSnapshotRequest createSnapshotRequest, RequestOptions options)
180180
throws IOException {
181-
return restHighLevelClient.performRequestAndParseEntity(createSnapshotRequest, RequestConverters::createSnapshot, options,
181+
return restHighLevelClient.performRequestAndParseEntity(createSnapshotRequest, SnapshotRequestConverters::createSnapshot, options,
182182
CreateSnapshotResponse::fromXContent, emptySet());
183183
}
184184

@@ -190,7 +190,7 @@ public CreateSnapshotResponse create(CreateSnapshotRequest createSnapshotRequest
190190
*/
191191
public void createAsync(CreateSnapshotRequest createSnapshotRequest, RequestOptions options,
192192
ActionListener<CreateSnapshotResponse> listener) {
193-
restHighLevelClient.performRequestAsyncAndParseEntity(createSnapshotRequest, RequestConverters::createSnapshot, options,
193+
restHighLevelClient.performRequestAsyncAndParseEntity(createSnapshotRequest, SnapshotRequestConverters::createSnapshot, options,
194194
CreateSnapshotResponse::fromXContent, listener, emptySet());
195195
}
196196

@@ -205,7 +205,7 @@ public void createAsync(CreateSnapshotRequest createSnapshotRequest, RequestOpti
205205
* @throws IOException in case there is a problem sending the request or parsing back the response
206206
*/
207207
public GetSnapshotsResponse get(GetSnapshotsRequest getSnapshotsRequest, RequestOptions options) throws IOException {
208-
return restHighLevelClient.performRequestAndParseEntity(getSnapshotsRequest, RequestConverters::getSnapshots, options,
208+
return restHighLevelClient.performRequestAndParseEntity(getSnapshotsRequest, SnapshotRequestConverters::getSnapshots, options,
209209
GetSnapshotsResponse::fromXContent, emptySet());
210210
}
211211

@@ -219,7 +219,7 @@ public GetSnapshotsResponse get(GetSnapshotsRequest getSnapshotsRequest, Request
219219
* @param listener the listener to be notified upon request completion
220220
*/
221221
public void getAsync(GetSnapshotsRequest getSnapshotsRequest, RequestOptions options, ActionListener<GetSnapshotsResponse> listener) {
222-
restHighLevelClient.performRequestAsyncAndParseEntity(getSnapshotsRequest, RequestConverters::getSnapshots, options,
222+
restHighLevelClient.performRequestAsyncAndParseEntity(getSnapshotsRequest, SnapshotRequestConverters::getSnapshots, options,
223223
GetSnapshotsResponse::fromXContent, listener, emptySet());
224224
}
225225

@@ -234,7 +234,7 @@ public void getAsync(GetSnapshotsRequest getSnapshotsRequest, RequestOptions opt
234234
*/
235235
public SnapshotsStatusResponse status(SnapshotsStatusRequest snapshotsStatusRequest, RequestOptions options)
236236
throws IOException {
237-
return restHighLevelClient.performRequestAndParseEntity(snapshotsStatusRequest, RequestConverters::snapshotsStatus, options,
237+
return restHighLevelClient.performRequestAndParseEntity(snapshotsStatusRequest, SnapshotRequestConverters::snapshotsStatus, options,
238238
SnapshotsStatusResponse::fromXContent, emptySet());
239239
}
240240

@@ -248,7 +248,7 @@ public SnapshotsStatusResponse status(SnapshotsStatusRequest snapshotsStatusRequ
248248
*/
249249
public void statusAsync(SnapshotsStatusRequest snapshotsStatusRequest, RequestOptions options,
250250
ActionListener<SnapshotsStatusResponse> listener) {
251-
restHighLevelClient.performRequestAsyncAndParseEntity(snapshotsStatusRequest, RequestConverters::snapshotsStatus, options,
251+
restHighLevelClient.performRequestAsyncAndParseEntity(snapshotsStatusRequest, SnapshotRequestConverters::snapshotsStatus, options,
252252
SnapshotsStatusResponse::fromXContent, listener, emptySet());
253253
}
254254

@@ -263,7 +263,7 @@ public void statusAsync(SnapshotsStatusRequest snapshotsStatusRequest, RequestOp
263263
* @throws IOException in case there is a problem sending the request or parsing back the response
264264
*/
265265
public RestoreSnapshotResponse restore(RestoreSnapshotRequest restoreSnapshotRequest, RequestOptions options) throws IOException {
266-
return restHighLevelClient.performRequestAndParseEntity(restoreSnapshotRequest, RequestConverters::restoreSnapshot, options,
266+
return restHighLevelClient.performRequestAndParseEntity(restoreSnapshotRequest, SnapshotRequestConverters::restoreSnapshot, options,
267267
RestoreSnapshotResponse::fromXContent, emptySet());
268268
}
269269

@@ -278,7 +278,7 @@ public RestoreSnapshotResponse restore(RestoreSnapshotRequest restoreSnapshotReq
278278
*/
279279
public void restoreAsync(RestoreSnapshotRequest restoreSnapshotRequest, RequestOptions options,
280280
ActionListener<RestoreSnapshotResponse> listener) {
281-
restHighLevelClient.performRequestAsyncAndParseEntity(restoreSnapshotRequest, RequestConverters::restoreSnapshot, options,
281+
restHighLevelClient.performRequestAsyncAndParseEntity(restoreSnapshotRequest, SnapshotRequestConverters::restoreSnapshot, options,
282282
RestoreSnapshotResponse::fromXContent, listener, emptySet());
283283
}
284284

@@ -293,7 +293,7 @@ public void restoreAsync(RestoreSnapshotRequest restoreSnapshotRequest, RequestO
293293
* @throws IOException in case there is a problem sending the request or parsing back the response
294294
*/
295295
public AcknowledgedResponse delete(DeleteSnapshotRequest deleteSnapshotRequest, RequestOptions options) throws IOException {
296-
return restHighLevelClient.performRequestAndParseEntity(deleteSnapshotRequest, RequestConverters::deleteSnapshot, options,
296+
return restHighLevelClient.performRequestAndParseEntity(deleteSnapshotRequest, SnapshotRequestConverters::deleteSnapshot, options,
297297
AcknowledgedResponse::fromXContent, emptySet());
298298
}
299299

@@ -308,7 +308,7 @@ public AcknowledgedResponse delete(DeleteSnapshotRequest deleteSnapshotRequest,
308308
*/
309309
public void deleteAsync(DeleteSnapshotRequest deleteSnapshotRequest, RequestOptions options,
310310
ActionListener<AcknowledgedResponse> listener) {
311-
restHighLevelClient.performRequestAsyncAndParseEntity(deleteSnapshotRequest, RequestConverters::deleteSnapshot, options,
311+
restHighLevelClient.performRequestAsyncAndParseEntity(deleteSnapshotRequest, SnapshotRequestConverters::deleteSnapshot, options,
312312
AcknowledgedResponse::fromXContent, listener, emptySet());
313313
}
314314
}

0 commit comments

Comments
 (0)