Skip to content

Commit fd4dca8

Browse files
author
Hendrik Muhs
authored
[Transform] HLRC cleanups (#78909)
removes some "data frame" leftovers in transform code, no functional changes
1 parent 0a6b6d9 commit fd4dca8

File tree

6 files changed

+78
-80
lines changed

6 files changed

+78
-80
lines changed

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

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ final class TransformRequestConverters {
3838
private TransformRequestConverters() {}
3939

4040
static Request putTransform(PutTransformRequest putRequest) throws IOException {
41-
String endpoint = new RequestConverters.EndpointBuilder()
42-
.addPathPartAsIs("_transform")
43-
.addPathPart(putRequest.getConfig().getId())
44-
.build();
41+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_transform")
42+
.addPathPart(putRequest.getConfig().getId())
43+
.build();
4544
Request request = new Request(HttpPut.METHOD_NAME, endpoint);
4645
request.setEntity(createEntity(putRequest, REQUEST_BODY_CONTENT_TYPE));
4746
if (putRequest.getDeferValidation() != null) {
@@ -50,25 +49,23 @@ static Request putTransform(PutTransformRequest putRequest) throws IOException {
5049
return request;
5150
}
5251

53-
static Request updateTransform(UpdateTransformRequest updateDataFrameTransformRequest) throws IOException {
54-
String endpoint = new RequestConverters.EndpointBuilder()
55-
.addPathPartAsIs("_transform")
56-
.addPathPart(updateDataFrameTransformRequest.getId())
52+
static Request updateTransform(UpdateTransformRequest updateTransformRequest) throws IOException {
53+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_transform")
54+
.addPathPart(updateTransformRequest.getId())
5755
.addPathPart("_update")
5856
.build();
5957
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
60-
request.setEntity(createEntity(updateDataFrameTransformRequest, REQUEST_BODY_CONTENT_TYPE));
61-
if (updateDataFrameTransformRequest.getDeferValidation() != null) {
62-
request.addParameter(DEFER_VALIDATION, Boolean.toString(updateDataFrameTransformRequest.getDeferValidation()));
58+
request.setEntity(createEntity(updateTransformRequest, REQUEST_BODY_CONTENT_TYPE));
59+
if (updateTransformRequest.getDeferValidation() != null) {
60+
request.addParameter(DEFER_VALIDATION, Boolean.toString(updateTransformRequest.getDeferValidation()));
6361
}
6462
return request;
6563
}
6664

6765
static Request getTransform(GetTransformRequest getRequest) {
68-
String endpoint = new RequestConverters.EndpointBuilder()
69-
.addPathPartAsIs("_transform")
70-
.addPathPart(Strings.collectionToCommaDelimitedString(getRequest.getId()))
71-
.build();
66+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_transform")
67+
.addPathPart(Strings.collectionToCommaDelimitedString(getRequest.getId()))
68+
.build();
7269
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
7370
if (getRequest.getPageParams() != null && getRequest.getPageParams().getFrom() != null) {
7471
request.addParameter(PageParams.FROM.getPreferredName(), getRequest.getPageParams().getFrom().toString());
@@ -86,10 +83,7 @@ static Request getTransform(GetTransformRequest getRequest) {
8683
}
8784

8885
static Request deleteTransform(DeleteTransformRequest deleteRequest) {
89-
String endpoint = new RequestConverters.EndpointBuilder()
90-
.addPathPartAsIs("_transform")
91-
.addPathPart(deleteRequest.getId())
92-
.build();
86+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_transform").addPathPart(deleteRequest.getId()).build();
9387
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
9488
if (deleteRequest.getForce() != null) {
9589
request.addParameter(FORCE, Boolean.toString(deleteRequest.getForce()));
@@ -98,11 +92,10 @@ static Request deleteTransform(DeleteTransformRequest deleteRequest) {
9892
}
9993

10094
static Request startTransform(StartTransformRequest startRequest) {
101-
String endpoint = new RequestConverters.EndpointBuilder()
102-
.addPathPartAsIs("_transform")
103-
.addPathPart(startRequest.getId())
104-
.addPathPartAsIs("_start")
105-
.build();
95+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_transform")
96+
.addPathPart(startRequest.getId())
97+
.addPathPartAsIs("_start")
98+
.build();
10699
Request request = new Request(HttpPost.METHOD_NAME, endpoint);
107100
RequestConverters.Params params = new RequestConverters.Params();
108101
if (startRequest.getTimeout() != null) {
@@ -113,8 +106,7 @@ static Request startTransform(StartTransformRequest startRequest) {
113106
}
114107

115108
static Request stopTransform(StopTransformRequest stopRequest) {
116-
String endpoint = new RequestConverters.EndpointBuilder()
117-
.addPathPartAsIs("_transform")
109+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_transform")
118110
.addPathPart(stopRequest.getId())
119111
.addPathPartAsIs("_stop")
120112
.build();
@@ -151,11 +143,10 @@ static Request previewTransform(PreviewTransformRequest previewRequest) throws I
151143
}
152144

153145
static Request getTransformStats(GetTransformStatsRequest statsRequest) {
154-
String endpoint = new RequestConverters.EndpointBuilder()
155-
.addPathPartAsIs("_transform")
156-
.addPathPart(statsRequest.getId())
157-
.addPathPartAsIs("_stats")
158-
.build();
146+
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_transform")
147+
.addPathPart(statsRequest.getId())
148+
.addPathPartAsIs("_stats")
149+
.build();
159150
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
160151
if (statsRequest.getPageParams() != null && statsRequest.getPageParams().getFrom() != null) {
161152
request.addParameter(PageParams.FROM.getPreferredName(), statsRequest.getPageParams().getFrom().toString());

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

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
import org.elasticsearch.client.transform.transforms.pivot.PivotConfig;
4545
import org.elasticsearch.client.transform.transforms.pivot.TermsGroupSource;
4646
import org.elasticsearch.core.TimeValue;
47-
import org.elasticsearch.xcontent.XContentBuilder;
48-
import org.elasticsearch.xcontent.XContentType;
4947
import org.elasticsearch.index.query.MatchAllQueryBuilder;
5048
import org.elasticsearch.rest.RestStatus;
5149
import org.elasticsearch.search.SearchHit;
5250
import org.elasticsearch.search.aggregations.AggregationBuilders;
5351
import org.elasticsearch.search.aggregations.AggregatorFactories;
5452
import org.elasticsearch.search.builder.SearchSourceBuilder;
5553
import org.elasticsearch.search.sort.SortOrder;
54+
import org.elasticsearch.xcontent.XContentBuilder;
55+
import org.elasticsearch.xcontent.XContentType;
5656
import org.junit.After;
5757

5858
import java.io.IOException;
@@ -177,7 +177,7 @@ public void testCreateDelete() throws IOException {
177177
createIndex(sourceIndex);
178178

179179
String id = "test-crud";
180-
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
180+
TransformConfig transform = validTransformConfig(id, sourceIndex, "pivot-dest");
181181

182182
TransformClient client = highLevelClient().transform();
183183
AcknowledgedResponse ack = execute(new PutTransformRequest(transform), client::putTransform, client::putTransformAsync);
@@ -199,7 +199,7 @@ public void testUpdate() throws IOException {
199199
createIndex(sourceIndex);
200200

201201
String id = "test-update";
202-
TransformConfig transform = validDataFrameTransformConfigBuilder(id, sourceIndex, "pivot-dest").setSyncConfig(
202+
TransformConfig transform = validTransformConfigBuilder(id, sourceIndex, "pivot-dest").setSyncConfig(
203203
TimeSyncConfig.builder().setField("timestamp").setDelay(TimeValue.timeValueSeconds(60)).build()
204204
).build();
205205

@@ -227,7 +227,7 @@ public void testCreateDeleteWithDefer() throws IOException {
227227
String sourceIndex = "missing-source-index";
228228

229229
String id = "test-with-defer";
230-
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
230+
TransformConfig transform = validTransformConfig(id, sourceIndex, "pivot-dest");
231231
TransformClient client = highLevelClient().transform();
232232
PutTransformRequest request = new PutTransformRequest(transform);
233233
request.setDeferValidation(true);
@@ -243,7 +243,7 @@ public void testGetTransform() throws IOException {
243243
createIndex(sourceIndex);
244244

245245
String id = "test-get";
246-
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
246+
TransformConfig transform = validTransformConfig(id, sourceIndex, "pivot-dest");
247247

248248
TransformClient client = highLevelClient().transform();
249249
putTransform(transform);
@@ -261,10 +261,10 @@ public void testGetAllAndPageTransforms() throws IOException {
261261

262262
TransformClient client = highLevelClient().transform();
263263

264-
TransformConfig transform = validDataFrameTransformConfig("test-get-all-1", sourceIndex, "pivot-dest-1");
264+
TransformConfig transform = validTransformConfig("test-get-all-1", sourceIndex, "pivot-dest-1");
265265
putTransform(transform);
266266

267-
transform = validDataFrameTransformConfig("test-get-all-2", sourceIndex, "pivot-dest-2");
267+
transform = validTransformConfig("test-get-all-2", sourceIndex, "pivot-dest-2");
268268
putTransform(transform);
269269

270270
GetTransformRequest getRequest = new GetTransformRequest("_all");
@@ -299,7 +299,7 @@ public void testStartStop() throws IOException {
299299
createIndex(sourceIndex);
300300

301301
String id = "test-stop-start";
302-
TransformConfig transform = validDataFrameTransformConfig(id, sourceIndex, "pivot-dest");
302+
TransformConfig transform = validTransformConfig(id, sourceIndex, "pivot-dest");
303303

304304
TransformClient client = highLevelClient().transform();
305305
putTransform(transform);
@@ -341,11 +341,14 @@ public void testPreview() throws IOException {
341341
createIndex(sourceIndex);
342342
indexData(sourceIndex);
343343

344-
TransformConfig transform = validDataFrameTransformConfig("test-preview", sourceIndex, null);
344+
TransformConfig transform = validTransformConfig("test-preview", sourceIndex, null);
345345

346346
TransformClient client = highLevelClient().transform();
347-
PreviewTransformResponse preview =
348-
execute(new PreviewTransformRequest(transform), client::previewTransform, client::previewTransformAsync);
347+
PreviewTransformResponse preview = execute(
348+
new PreviewTransformRequest(transform),
349+
client::previewTransform,
350+
client::previewTransformAsync
351+
);
349352
assertExpectedPreview(preview);
350353
}
351354

@@ -355,12 +358,15 @@ public void testPreviewById() throws IOException {
355358
indexData(sourceIndex);
356359

357360
String transformId = "test-preview-by-id";
358-
TransformConfig transform = validDataFrameTransformConfig(transformId, sourceIndex, "pivot-dest");
361+
TransformConfig transform = validTransformConfig(transformId, sourceIndex, "pivot-dest");
359362
putTransform(transform);
360363

361364
TransformClient client = highLevelClient().transform();
362-
PreviewTransformResponse preview =
363-
execute(new PreviewTransformRequest(transformId), client::previewTransform, client::previewTransformAsync);
365+
PreviewTransformResponse preview = execute(
366+
new PreviewTransformRequest(transformId),
367+
client::previewTransform,
368+
client::previewTransformAsync
369+
);
364370
assertExpectedPreview(preview);
365371
}
366372

@@ -383,11 +389,11 @@ private static void assertExpectedPreview(PreviewTransformResponse preview) {
383389
assertThat(fields.get("avg_rating"), equalTo(Map.of("type", "double")));
384390
}
385391

386-
private TransformConfig validDataFrameTransformConfig(String id, String source, String destination) {
387-
return validDataFrameTransformConfigBuilder(id, source, destination).build();
392+
private TransformConfig validTransformConfig(String id, String source, String destination) {
393+
return validTransformConfigBuilder(id, source, destination).build();
388394
}
389395

390-
private TransformConfig.Builder validDataFrameTransformConfigBuilder(String id, String source, String destination) {
396+
private TransformConfig.Builder validTransformConfigBuilder(String id, String source, String destination) {
391397
GroupConfig groupConfig = GroupConfig.builder().groupBy("reviewer", TermsGroupSource.builder().setField("user_id").build()).build();
392398
AggregatorFactories.Builder aggBuilder = new AggregatorFactories.Builder();
393399
aggBuilder.addAggregator(AggregationBuilders.avg("avg_rating").field("stars"));

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
import org.elasticsearch.client.transform.transforms.TransformConfigUpdateTests;
3030
import org.elasticsearch.common.settings.Settings;
3131
import org.elasticsearch.core.TimeValue;
32+
import org.elasticsearch.search.SearchModule;
33+
import org.elasticsearch.test.ESTestCase;
3234
import org.elasticsearch.xcontent.NamedXContentRegistry;
3335
import org.elasticsearch.xcontent.XContentParser;
3436
import org.elasticsearch.xcontent.json.JsonXContent;
35-
import org.elasticsearch.search.SearchModule;
36-
import org.elasticsearch.test.ESTestCase;
3737

3838
import java.io.IOException;
3939
import java.util.Collections;
@@ -58,9 +58,8 @@ protected NamedXContentRegistry xContentRegistry() {
5858
return new NamedXContentRegistry(namedXContents);
5959
}
6060

61-
public void testPutDataFrameTransform() throws IOException {
62-
PutTransformRequest putRequest = new PutTransformRequest(
63-
TransformConfigTests.randomTransformConfig());
61+
public void testPutTransform() throws IOException {
62+
PutTransformRequest putRequest = new PutTransformRequest(TransformConfigTests.randomTransformConfig());
6463
Request request = TransformRequestConverters.putTransform(putRequest);
6564
assertThat(request.getParameters(), not(hasKey("defer_validation")));
6665
assertEquals(HttpPut.METHOD_NAME, request.getMethod());
@@ -75,11 +74,12 @@ public void testPutDataFrameTransform() throws IOException {
7574
assertThat(request.getParameters(), hasEntry("defer_validation", Boolean.toString(putRequest.getDeferValidation())));
7675
}
7776

78-
public void testUpdateDataFrameTransform() throws IOException {
77+
public void testUpdateTransform() throws IOException {
7978
String transformId = randomAlphaOfLength(10);
8079
UpdateTransformRequest updateDataFrameTransformRequest = new UpdateTransformRequest(
8180
TransformConfigUpdateTests.randomTransformConfigUpdate(),
82-
transformId);
81+
transformId
82+
);
8383
Request request = TransformRequestConverters.updateTransform(updateDataFrameTransformRequest);
8484
assertThat(request.getParameters(), not(hasKey("defer_validation")));
8585
assertEquals(HttpPost.METHOD_NAME, request.getMethod());
@@ -91,11 +91,13 @@ public void testUpdateDataFrameTransform() throws IOException {
9191
}
9292
updateDataFrameTransformRequest.setDeferValidation(true);
9393
request = TransformRequestConverters.updateTransform(updateDataFrameTransformRequest);
94-
assertThat(request.getParameters(),
95-
hasEntry("defer_validation", Boolean.toString(updateDataFrameTransformRequest.getDeferValidation())));
94+
assertThat(
95+
request.getParameters(),
96+
hasEntry("defer_validation", Boolean.toString(updateDataFrameTransformRequest.getDeferValidation()))
97+
);
9698
}
9799

98-
public void testDeleteDataFrameTransform() {
100+
public void testDeleteTransform() {
99101
DeleteTransformRequest deleteRequest = new DeleteTransformRequest("foo");
100102
Request request = TransformRequestConverters.deleteTransform(deleteRequest);
101103

@@ -110,7 +112,7 @@ public void testDeleteDataFrameTransform() {
110112
assertThat(request.getParameters(), hasEntry("force", "true"));
111113
}
112114

113-
public void testStartDataFrameTransform() {
115+
public void testStartTransform() {
114116
String id = randomAlphaOfLength(10);
115117
TimeValue timeValue = null;
116118
if (randomBoolean()) {
@@ -130,7 +132,7 @@ public void testStartDataFrameTransform() {
130132
}
131133
}
132134

133-
public void testStopDataFrameTransform() {
135+
public void testStopTransform() {
134136
String id = randomAlphaOfLength(10);
135137
Boolean waitForCompletion = null;
136138
if (randomBoolean()) {
@@ -177,7 +179,7 @@ public void testStopDataFrameTransform() {
177179
assertEquals(stopRequest.getAllowNoMatch(), Boolean.parseBoolean(request.getParameters().get(ALLOW_NO_MATCH)));
178180
}
179181

180-
public void testPreviewDataFrameTransform() throws IOException {
182+
public void testPreviewTransform() throws IOException {
181183
PreviewTransformRequest previewRequest = new PreviewTransformRequest(TransformConfigTests.randomTransformConfig());
182184
Request request = TransformRequestConverters.previewTransform(previewRequest);
183185

@@ -190,7 +192,7 @@ public void testPreviewDataFrameTransform() throws IOException {
190192
}
191193
}
192194

193-
public void testPreviewDataFrameTransformById() throws IOException {
195+
public void testPreviewTransformById() throws IOException {
194196
String transformId = randomAlphaOfLengthBetween(1, 10);
195197
PreviewTransformRequest previewRequest = new PreviewTransformRequest(transformId);
196198
Request request = TransformRequestConverters.previewTransform(previewRequest);
@@ -200,7 +202,7 @@ public void testPreviewDataFrameTransformById() throws IOException {
200202
assertThat(request.getEntity(), nullValue());
201203
}
202204

203-
public void testGetDataFrameTransformStats() {
205+
public void testGetTransformStats() {
204206
GetTransformStatsRequest getStatsRequest = new GetTransformStatsRequest("foo");
205207
Request request = TransformRequestConverters.getTransformStats(getStatsRequest);
206208

@@ -230,7 +232,7 @@ public void testGetDataFrameTransformStats() {
230232
assertThat(request.getParameters(), hasEntry("allow_no_match", "false"));
231233
}
232234

233-
public void testGetDataFrameTransform() {
235+
public void testGetTransform() {
234236
GetTransformRequest getRequest = new GetTransformRequest("bar");
235237
Request request = TransformRequestConverters.getTransform(getRequest);
236238

@@ -260,7 +262,7 @@ public void testGetDataFrameTransform() {
260262
assertThat(request.getParameters(), hasEntry("allow_no_match", "false"));
261263
}
262264

263-
public void testGetDataFrameTransform_givenMulitpleIds() {
265+
public void testGetTransform_givenMulitpleIds() {
264266
GetTransformRequest getRequest = new GetTransformRequest("foo", "bar", "baz");
265267
Request request = TransformRequestConverters.getTransform(getRequest);
266268

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
import org.elasticsearch.client.transform.transforms.pivot.PivotConfig;
5151
import org.elasticsearch.client.transform.transforms.pivot.TermsGroupSource;
5252
import org.elasticsearch.core.TimeValue;
53-
import org.elasticsearch.xcontent.XContentBuilder;
5453
import org.elasticsearch.index.query.MatchAllQueryBuilder;
5554
import org.elasticsearch.search.aggregations.AggregationBuilders;
5655
import org.elasticsearch.search.aggregations.AggregatorFactories;
56+
import org.elasticsearch.xcontent.XContentBuilder;
5757
import org.junit.After;
5858

5959
import java.io.IOException;
@@ -445,7 +445,7 @@ public void onFailure(Exception e) {
445445
}
446446
}
447447

448-
public void testDeleteDataFrameTransform() throws IOException, InterruptedException {
448+
public void testDeleteTransform() throws IOException, InterruptedException {
449449
createIndex("source-data");
450450

451451
RestHighLevelClient client = highLevelClient();
@@ -670,7 +670,7 @@ public void onFailure(Exception e) {
670670
}
671671
}
672672

673-
public void testGetDataFrameTransform() throws IOException, InterruptedException {
673+
public void testGetTransform() throws IOException, InterruptedException {
674674
createIndex("source-data");
675675

676676
GroupConfig groupConfig = GroupConfig.builder().groupBy("reviewer", TermsGroupSource.builder().setField("user_id").build()).build();

0 commit comments

Comments
 (0)