honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-28 02:48:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CreateRepository Requeset in HLRC () ()

Browse Source 
* verify = false is the non-default case for this request -> adjusted the code accordingly and expanded the test to cover this case
* Closes
This commit is contained in:
Armin Braun 2019-06-25 13:04:43 +02:00 committed by GitHub
parent 62a28921e8
commit b4ed7f463a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
client/rest-high-level/src
main/java/org/elasticsearch/client
RequestConverters.javaSnapshotRequestConverters.java
test/java/org/elasticsearch/client
SnapshotRequestConvertersTests.java

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

@ -1041,13 +1041,6 @@ final class RequestConverters {
return this;
}
Params withVerify(boolean verify) {
if (verify) {
return putParam("verify", Boolean.TRUE.toString());
}
return this;
}
Params withWaitForStatus(ClusterHealthStatus status) {
if (status != null) {
return putParam("wait_for_status", status.name().toLowerCase(Locale.ROOT));

4
client/rest-high-level/src/main/java/org/elasticsearch/client/SnapshotRequestConverters.java

@ -60,7 +60,9 @@ final class SnapshotRequestConverters {
RequestConverters.Params parameters = new RequestConverters.Params();
parameters.withMasterTimeout(putRepositoryRequest.masterNodeTimeout());
parameters.withTimeout(putRepositoryRequest.timeout());
parameters.withVerify(putRepositoryRequest.verify());
if (putRepositoryRequest.verify() == false) {
parameters.putParam("verify", "false");
}
request.addParameters(parameters.asMap());
request.setEntity(RequestConverters.createEntity(putRepositoryRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
return request;

8
client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotRequestConvertersTests.java

@ -78,7 +78,8 @@ public class SnapshotRequestConvertersTests extends ESTestCase {
Path repositoryLocation = PathUtils.get(".");
PutRepositoryRequest putRepositoryRequest = new PutRepositoryRequest(repository);
putRepositoryRequest.type(FsRepository.TYPE);
putRepositoryRequest.verify(randomBoolean());
final boolean verify = randomBoolean();
putRepositoryRequest.verify(verify);
putRepositoryRequest.settings(
Settings.builder()
@ -90,6 +91,11 @@ public class SnapshotRequestConvertersTests extends ESTestCase {
Request request = SnapshotRequestConverters.createRepository(putRepositoryRequest);
assertThat(request.getEndpoint(), equalTo(endpoint));
assertThat(request.getMethod(), equalTo(HttpPut.METHOD_NAME));
if (verify) {
assertThat(request.getParameters().get("verify"), nullValue());
} else {
assertThat(request.getParameters().get("verify"), equalTo("false"));
}
RequestConvertersTests.assertToXContentBody(putRepositoryRequest, request.getEntity());
}