diff options
Diffstat (limited to 'core/src/test/java/org/elasticsearch/snapshots')
-rw-r--r-- | core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java | 5 | ||||
-rw-r--r-- | core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java index 0000e73e27..6116cfa8b9 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java @@ -65,6 +65,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; @@ -533,7 +534,7 @@ public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCas .endObject() .endArray() .endObject().bytes(); - assertAcked(client().admin().cluster().preparePutPipeline("barbaz", pipelineSource).get()); + assertAcked(client().admin().cluster().preparePutPipeline("barbaz", pipelineSource, XContentType.JSON).get()); } if(testScript) { @@ -541,7 +542,7 @@ public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCas assertAcked(client().admin().cluster().preparePutStoredScript() .setLang(MockScriptEngine.NAME) .setId("foobar") - .setContent(new BytesArray("{\"script\":\"1\"}"))); + .setContent(new BytesArray("{\"script\":\"1\"}"), XContentType.JSON)); } logger.info("--> snapshot without global state"); diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java index cdacabdd66..a8e1eeaec1 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java @@ -79,7 +79,7 @@ public class SnapshotRequestsTests extends ESTestCase { BytesReference bytes = builder.endObject().bytes(); - request.source(XContentHelper.convertToMap(bytes, true).v2()); + request.source(XContentHelper.convertToMap(bytes, true, builder.contentType()).v2()); assertEquals("test-repo", request.repository()); assertEquals("test-snap", request.snapshot()); @@ -137,7 +137,7 @@ public class SnapshotRequestsTests extends ESTestCase { BytesReference bytes = builder.endObject().bytes(); - request.source(XContentHelper.convertToMap(bytes, true).v2()); + request.source(XContentHelper.convertToMap(bytes, true, builder.contentType()).v2()); assertEquals("test-repo", request.repository()); assertEquals("test-snap", request.snapshot()); |