Skip to content

Commit

Permalink
Use typeless APIs
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasontedor
jasontedor committed Feb 6, 2019
1 parent 43383de commit 22eeb0c
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ public void testRollover() throws IOException {
bulk.append("{\"index\":{}}\n");
bulk.append("{\"test\":\"test\"}\n");
}
Request bulkRequest = new Request("POST", "/" + index + "_write/doc/_bulk");
Request bulkRequest = new Request("POST", "/" + index + "_write/_doc/_bulk");
bulkRequest.setJsonEntity(bulk.toString());
bulkRequest.addParameter("refresh", "");
bulkRequest.setOptions(expectWarnings(RestBulkAction.TYPES_DEPRECATION_MESSAGE));
Expand Down Expand Up @@ -644,12 +644,12 @@ void assertRealtimeGetWorks() throws IOException {
Map<?, ?> hit = (Map<?, ?>) ((List<?>)(XContentMapValues.extractValue("hits.hits", searchResponse))).get(0);
String docId = (String) hit.get("_id");

Request updateRequest = new Request("POST", "/" + index + "/doc/" + docId + "/_update");
Request updateRequest = new Request("POST", "/" + index + "/_doc/" + docId + "/_update");
updateRequest.setOptions(expectWarnings(RestUpdateAction.TYPES_DEPRECATION_MESSAGE));
updateRequest.setJsonEntity("{ \"doc\" : { \"foo\": \"bar\"}}");
client().performRequest(updateRequest);

Request getRequest = new Request("GET", "/" + index + "/doc/" + docId);
Request getRequest = new Request("GET", "/" + index + "/_doc/" + docId);
getRequest.setOptions(expectWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE));
Map<String, Object> getRsp = entityAsMap(client().performRequest(getRequest));
Map<?, ?> source = (Map<?, ?>) getRsp.get("_source");
Expand Down Expand Up @@ -704,7 +704,7 @@ int extractTotalHits(Map<?, ?> response) {
* Tests that a single document survives. Super basic smoke test.
*/
public void testSingleDoc() throws IOException {
String docLocation = "/" + index + "/doc/1";
String docLocation = "/" + index + "/_doc/1";
String doc = "{\"test\": \"test\"}";

if (isRunningAgainstOldCluster()) {
Expand Down Expand Up @@ -1016,7 +1016,7 @@ public void testSoftDeletes() throws Exception {
int numDocs = between(10, 100);
for (int i = 0; i < numDocs; i++) {
String doc = Strings.toString(JsonXContent.contentBuilder().startObject().field("field", "v1").endObject());
Request request = new Request("POST", "/" + index + "/doc/" + i);
Request request = new Request("POST", "/" + index + "/_doc/" + i);
request.setJsonEntity(doc);
client().performRequest(request);
if (rarely()) {
Expand All @@ -1029,11 +1029,11 @@ public void testSoftDeletes() throws Exception {
for (int i = 0; i < numDocs; i++) {
if (randomBoolean()) {
String doc = Strings.toString(JsonXContent.contentBuilder().startObject().field("field", "v2").endObject());
Request request = new Request("POST", "/" + index + "/doc/" + i);
Request request = new Request("POST", "/" + index + "/_doc/" + i);
request.setJsonEntity(doc);
client().performRequest(request);
} else if (randomBoolean()) {
client().performRequest(new Request("DELETE", "/" + index + "/doc/" + i));
client().performRequest(new Request("DELETE", "/" + index + "/_doc/" + i));
liveDocs--;
}
}
Expand Down Expand Up @@ -1103,7 +1103,7 @@ && getOldClusterVersion().onOrAfter(Version.V_6_1_0) && getOldClusterVersion().b
bulk.append("{\"index\":{\"_id\":\"").append(count + i).append("\"}}\n");
bulk.append("{\"test\":\"test\"}\n");
}
Request writeToRestoredRequest = new Request("POST", "/restored_" + index + "/doc/_bulk");
Request writeToRestoredRequest = new Request("POST", "/restored_" + index + "/_doc/_bulk");
writeToRestoredRequest.addParameter("refresh", "true");
writeToRestoredRequest.setJsonEntity(bulk.toString());
writeToRestoredRequest.setOptions(expectWarnings(RestBulkAction.TYPES_DEPRECATION_MESSAGE));
Expand Down Expand Up @@ -1166,7 +1166,7 @@ private void indexRandomDocuments(int count, boolean flushAllowed, boolean saveI
logger.info("Indexing {} random documents", count);
for (int i = 0; i < count; i++) {
logger.debug("Indexing document [{}]", i);
Request createDocument = new Request("POST", "/" + index + "/doc/" + i);
Request createDocument = new Request("POST", "/" + index + "/_doc/" + i);
createDocument.setJsonEntity(Strings.toString(docSupplier.apply(i)));
client().performRequest(createDocument);
if (rarely()) {
Expand All @@ -1191,14 +1191,14 @@ private void saveInfoDocument(String type, String value) throws IOException {
infoDoc.field("value", value);
infoDoc.endObject();
// Only create the first version so we know how many documents are created when the index is first created
Request request = new Request("PUT", "/info/doc/" + index + "_" + type);
Request request = new Request("PUT", "/info/_doc/" + index + "_" + type);
request.addParameter("op_type", "create");
request.setJsonEntity(Strings.toString(infoDoc));
client().performRequest(request);
}

private String loadInfoDocument(String type) throws IOException {
Request request = new Request("GET", "/info/doc/" + index + "_" + type);
Request request = new Request("GET", "/info/_doc/" + index + "_" + type);
request.addParameter("filter_path", "_source");
request.setOptions(expectWarnings(RestGetAction.TYPES_DEPRECATION_MESSAGE));
String doc = toStr(client().performRequest(request));
Expand Down

0 comments on commit 22eeb0c

Please sign in to comment.