Skip to content

Commit b20f2e1

Browse files
author
Hendrik Muhs
committed
adapt tests
1 parent dfa017e commit b20f2e1

File tree

6 files changed

+63
-63
lines changed

6 files changed

+63
-63
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public class RestHighLevelClient implements Closeable {
256256
private final IndexLifecycleClient ilmClient = new IndexLifecycleClient(this);
257257
private final RollupClient rollupClient = new RollupClient(this);
258258
private final CcrClient ccrClient = new CcrClient(this);
259-
private final TransformClient dataFrameClient = new TransformClient(this);
259+
private final TransformClient transformClient = new TransformClient(this);
260260

261261
/**
262262
* Creates a {@link RestHighLevelClient} given the low level {@link RestClientBuilder} that allows to build the
@@ -477,8 +477,8 @@ public SecurityClient security() {
477477
*
478478
* @return the client wrapper for making Data Frame API calls
479479
*/
480-
public TransformClient dataFrame() {
481-
return dataFrameClient;
480+
public TransformClient transform() {
481+
return transformClient;
482482
}
483483

484484
/**

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ public UpdateTransformResponse updateTransform(UpdateTransformRequest request,
124124
* @param listener Listener to be notified upon request completion
125125
* @return cancellable that may be used to cancel the request
126126
*/
127-
public Cancellable updateDataFrameTransformAsync(UpdateTransformRequest request,
128-
RequestOptions options,
129-
ActionListener<UpdateTransformResponse> listener) {
127+
public Cancellable updateTransformAsync(UpdateTransformRequest request,
128+
RequestOptions options,
129+
ActionListener<UpdateTransformResponse> listener) {
130130
return restHighLevelClient.performRequestAsyncAndParseEntity(request,
131131
TransformRequestConverters::updateTransform,
132132
options,

‎client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ private void indexData(String indexName) throws IOException {
146146
@After
147147
public void cleanUpTransforms() throws Exception {
148148
for (String transformId : transformsToClean) {
149-
highLevelClient().dataFrame().stopTransform(
149+
highLevelClient().transform().stopTransform(
150150
new StopTransformRequest(transformId, Boolean.TRUE, null), RequestOptions.DEFAULT);
151151
}
152152

153153
for (String transformId : transformsToClean) {
154-
highLevelClient().dataFrame().deleteDataFrameTransform(
154+
highLevelClient().transform().deleteTransform(
155155
new DeleteTransformRequest(transformId), RequestOptions.DEFAULT);
156156
}
157157

@@ -166,18 +166,18 @@ public void testCreateDelete() throws IOException {
166166
String id = "test-crud";
167167
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
168168

169-
TransformClient client = highLevelClient().dataFrame();
169+
TransformClient client = highLevelClient().transform();
170170
AcknowledgedResponse ack = execute(new PutTransformRequest(transform), client::putTransform,
171171
client::putTransformAsync);
172172
assertTrue(ack.isAcknowledged());
173173

174-
ack = execute(new DeleteTransformRequest(transform.getId()), client::deleteDataFrameTransform,
174+
ack = execute(new DeleteTransformRequest(transform.getId()), client::deleteTransform,
175175
client::deleteTransformAsync);
176176
assertTrue(ack.isAcknowledged());
177177

178178
// The second delete should fail
179179
ElasticsearchStatusException deleteError = expectThrows(ElasticsearchStatusException.class,
180-
() -> execute(new DeleteTransformRequest(transform.getId()), client::deleteDataFrameTransform,
180+
() -> execute(new DeleteTransformRequest(transform.getId()), client::deleteTransform,
181181
client::deleteTransformAsync));
182182
assertThat(deleteError.getMessage(), containsString("Transform with id [test-crud] could not be found"));
183183
}
@@ -191,21 +191,21 @@ public void testUpdate() throws IOException {
191191
.setSyncConfig(new TimeSyncConfig("timefield", TimeValue.timeValueSeconds(60)))
192192
.build();
193193

194-
TransformClient client = highLevelClient().dataFrame();
194+
TransformClient client = highLevelClient().transform();
195195
AcknowledgedResponse ack = execute(new PutTransformRequest(transform), client::putTransform,
196196
client::putTransformAsync);
197197
assertTrue(ack.isAcknowledged());
198198

199199
String updatedDescription = "my new description";
200200
TransformConfigUpdate update = TransformConfigUpdate.builder().setDescription(updatedDescription).build();
201201
UpdateTransformResponse response = execute(
202-
new UpdateTransformRequest(update, id), client::updateDataFrameTransform,
203-
client::updateDataFrameTransformAsync);
202+
new UpdateTransformRequest(update, id), client::updateTransform,
203+
client::updateTransformAsync);
204204
assertThat(response.getTransformConfiguration().getDescription(), equalTo(updatedDescription));
205205

206206
ElasticsearchStatusException updateError = expectThrows(ElasticsearchStatusException.class,
207-
() -> execute(new UpdateTransformRequest(update, "missing-transform"), client::updateDataFrameTransform,
208-
client::updateDataFrameTransformAsync));
207+
() -> execute(new UpdateTransformRequest(update, "missing-transform"), client::updateTransform,
208+
client::updateTransformAsync));
209209
assertThat(updateError.getMessage(), containsString("Transform with id [missing-transform] could not be found"));
210210
}
211211

@@ -214,13 +214,13 @@ public void testCreateDeleteWithDefer() throws IOException {
214214

215215
String id = "test-with-defer";
216216
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
217-
TransformClient client = highLevelClient().dataFrame();
217+
TransformClient client = highLevelClient().transform();
218218
PutTransformRequest request = new PutTransformRequest(transform);
219219
request.setDeferValidation(true);
220220
AcknowledgedResponse ack = execute(request, client::putTransform, client::putTransformAsync);
221221
assertTrue(ack.isAcknowledged());
222222

223-
ack = execute(new DeleteTransformRequest(transform.getId()), client::deleteDataFrameTransform,
223+
ack = execute(new DeleteTransformRequest(transform.getId()), client::deleteTransform,
224224
client::deleteTransformAsync);
225225
assertTrue(ack.isAcknowledged());
226226
}
@@ -232,7 +232,7 @@ public void testGetTransform() throws IOException {
232232
String id = "test-get";
233233
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
234234

235-
TransformClient client = highLevelClient().dataFrame();
235+
TransformClient client = highLevelClient().transform();
236236
putTransform(transform);
237237

238238
GetTransformRequest getRequest = new GetTransformRequest(id);
@@ -247,7 +247,7 @@ public void testGetAllAndPageTransforms() throws IOException {
247247
String sourceIndex = "transform-source";
248248
createIndex(sourceIndex);
249249

250-
TransformClient client = highLevelClient().dataFrame();
250+
TransformClient client = highLevelClient().transform();
251251

252252
TransformConfig transform = validDataFrameTransformConfig("test-get-all-1", sourceIndex, "pivot-dest-1");
253253
putTransform(transform);
@@ -276,7 +276,7 @@ public void testGetAllAndPageTransforms() throws IOException {
276276
}
277277

278278
public void testGetMissingTransform() {
279-
TransformClient client = highLevelClient().dataFrame();
279+
TransformClient client = highLevelClient().transform();
280280

281281
ElasticsearchStatusException missingError = expectThrows(ElasticsearchStatusException.class,
282282
() -> execute(new GetTransformRequest("unknown"), client::getTransform,
@@ -291,12 +291,12 @@ public void testStartStop() throws IOException {
291291
String id = "test-stop-start";
292292
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
293293

294-
TransformClient client = highLevelClient().dataFrame();
294+
TransformClient client = highLevelClient().transform();
295295
putTransform(transform);
296296

297297
StartTransformRequest startRequest = new StartTransformRequest(id);
298298
StartTransformResponse startResponse =
299-
execute(startRequest, client::startDataFrameTransform, client::startTransformAsync);
299+
execute(startRequest, client::startTransform, client::startTransformAsync);
300300
assertTrue(startResponse.isAcknowledged());
301301
assertThat(startResponse.getNodeFailures(), empty());
302302
assertThat(startResponse.getTaskFailures(), empty());
@@ -332,7 +332,7 @@ public void testPreview() throws IOException {
332332

333333
TransformConfig transform = validDataFrameTransformConfig("test-preview", sourceIndex, null);
334334

335-
TransformClient client = highLevelClient().dataFrame();
335+
TransformClient client = highLevelClient().transform();
336336
PreviewTransformResponse preview = execute(new PreviewTransformRequest(transform),
337337
client::previewTransform,
338338
client::previewTransformAsync);
@@ -396,7 +396,7 @@ public void testGetStats() throws Exception {
396396
.setDescription("transform for testing stats")
397397
.build();
398398

399-
TransformClient client = highLevelClient().dataFrame();
399+
TransformClient client = highLevelClient().transform();
400400
putTransform(transform);
401401

402402
GetTransformStatsResponse statsResponse = execute(new GetTransformStatsRequest(id),
@@ -424,7 +424,7 @@ public void testGetStats() throws Exception {
424424

425425
// start the transform
426426
StartTransformResponse startTransformResponse = execute(new StartTransformRequest(id),
427-
client::startDataFrameTransform,
427+
client::startTransform,
428428
client::startTransformAsync);
429429
assertThat(startTransformResponse.isAcknowledged(), is(true));
430430
assertBusy(() -> {
@@ -439,7 +439,7 @@ public void testGetStats() throws Exception {
439439
}
440440

441441
void putTransform(TransformConfig config) throws IOException {
442-
TransformClient client = highLevelClient().dataFrame();
442+
TransformClient client = highLevelClient().transform();
443443
AcknowledgedResponse ack = execute(new PutTransformRequest(config), client::putTransform,
444444
client::putTransformAsync);
445445
assertTrue(ack.isAcknowledged());

0 commit comments

Comments
 (0)