Skip to content

Commit fd3dc4d

Browse files
author
Hendrik Muhs
authored
[Transform] rename data frame transform to transform for hlrc client (#46933)
rename data frame transform to transform for hlrc
1 parent 0776153 commit fd3dc4d

File tree

90 files changed

+1258
-1258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1258
-1258
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 DataFrameClient dataFrameClient = new DataFrameClient(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 DataFrameClient dataFrame() {
481-
return dataFrameClient;
480+
public TransformClient transform() {
481+
return transformClient;
482482
}
483483

484484
/**

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

Lines changed: 82 additions & 82 deletions
Large diffs are not rendered by default.

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@
2424
import org.apache.http.client.methods.HttpPost;
2525
import org.apache.http.client.methods.HttpPut;
2626
import org.elasticsearch.client.core.PageParams;
27-
import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest;
28-
import org.elasticsearch.client.transform.GetDataFrameTransformRequest;
29-
import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest;
30-
import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest;
31-
import org.elasticsearch.client.transform.PutDataFrameTransformRequest;
32-
import org.elasticsearch.client.transform.StartDataFrameTransformRequest;
33-
import org.elasticsearch.client.transform.StopDataFrameTransformRequest;
34-
import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest;
27+
import org.elasticsearch.client.transform.DeleteTransformRequest;
28+
import org.elasticsearch.client.transform.GetTransformRequest;
29+
import org.elasticsearch.client.transform.GetTransformStatsRequest;
30+
import org.elasticsearch.client.transform.PreviewTransformRequest;
31+
import org.elasticsearch.client.transform.PutTransformRequest;
32+
import org.elasticsearch.client.transform.StartTransformRequest;
33+
import org.elasticsearch.client.transform.StopTransformRequest;
34+
import org.elasticsearch.client.transform.UpdateTransformRequest;
3535
import org.elasticsearch.common.Strings;
3636

3737
import java.io.IOException;
3838

3939
import static org.elasticsearch.client.RequestConverters.REQUEST_BODY_CONTENT_TYPE;
4040
import static org.elasticsearch.client.RequestConverters.createEntity;
41-
import static org.elasticsearch.client.transform.DeleteDataFrameTransformRequest.FORCE;
42-
import static org.elasticsearch.client.transform.GetDataFrameTransformRequest.ALLOW_NO_MATCH;
43-
import static org.elasticsearch.client.transform.PutDataFrameTransformRequest.DEFER_VALIDATION;
41+
import static org.elasticsearch.client.transform.DeleteTransformRequest.FORCE;
42+
import static org.elasticsearch.client.transform.GetTransformRequest.ALLOW_NO_MATCH;
43+
import static org.elasticsearch.client.transform.PutTransformRequest.DEFER_VALIDATION;
4444

45-
final class DataFrameRequestConverters {
45+
final class TransformRequestConverters {
4646

47-
private DataFrameRequestConverters() {}
47+
private TransformRequestConverters() {}
4848

49-
static Request putDataFrameTransform(PutDataFrameTransformRequest putRequest) throws IOException {
49+
static Request putTransform(PutTransformRequest putRequest) throws IOException {
5050
String endpoint = new RequestConverters.EndpointBuilder()
5151
.addPathPartAsIs("_data_frame", "transforms")
5252
.addPathPart(putRequest.getConfig().getId())
@@ -59,7 +59,7 @@ static Request putDataFrameTransform(PutDataFrameTransformRequest putRequest) th
5959
return request;
6060
}
6161

62-
static Request updateDataFrameTransform(UpdateDataFrameTransformRequest updateDataFrameTransformRequest) throws IOException {
62+
static Request updateTransform(UpdateTransformRequest updateDataFrameTransformRequest) throws IOException {
6363
String endpoint = new RequestConverters.EndpointBuilder()
6464
.addPathPartAsIs("_data_frame", "transforms")
6565
.addPathPart(updateDataFrameTransformRequest.getId())
@@ -73,7 +73,7 @@ static Request updateDataFrameTransform(UpdateDataFrameTransformRequest updateDa
7373
return request;
7474
}
7575

76-
static Request getDataFrameTransform(GetDataFrameTransformRequest getRequest) {
76+
static Request getTransform(GetTransformRequest getRequest) {
7777
String endpoint = new RequestConverters.EndpointBuilder()
7878
.addPathPartAsIs("_data_frame", "transforms")
7979
.addPathPart(Strings.collectionToCommaDelimitedString(getRequest.getId()))
@@ -91,7 +91,7 @@ static Request getDataFrameTransform(GetDataFrameTransformRequest getRequest) {
9191
return request;
9292
}
9393

94-
static Request deleteDataFrameTransform(DeleteDataFrameTransformRequest deleteRequest) {
94+
static Request deleteTransform(DeleteTransformRequest deleteRequest) {
9595
String endpoint = new RequestConverters.EndpointBuilder()
9696
.addPathPartAsIs("_data_frame", "transforms")
9797
.addPathPart(deleteRequest.getId())
@@ -103,7 +103,7 @@ static Request deleteDataFrameTransform(DeleteDataFrameTransformRequest deleteRe
103103
return request;
104104
}
105105

106-
static Request startDataFrameTransform(StartDataFrameTransformRequest startRequest) {
106+
static Request startTransform(StartTransformRequest startRequest) {
107107
String endpoint = new RequestConverters.EndpointBuilder()
108108
.addPathPartAsIs("_data_frame", "transforms")
109109
.addPathPart(startRequest.getId())
@@ -118,7 +118,7 @@ static Request startDataFrameTransform(StartDataFrameTransformRequest startReque
118118
return request;
119119
}
120120

121-
static Request stopDataFrameTransform(StopDataFrameTransformRequest stopRequest) {
121+
static Request stopTransform(StopTransformRequest stopRequest) {
122122
String endpoint = new RequestConverters.EndpointBuilder()
123123
.addPathPartAsIs("_data_frame", "transforms")
124124
.addPathPart(stopRequest.getId())
@@ -139,7 +139,7 @@ static Request stopDataFrameTransform(StopDataFrameTransformRequest stopRequest)
139139
return request;
140140
}
141141

142-
static Request previewDataFrameTransform(PreviewDataFrameTransformRequest previewRequest) throws IOException {
142+
static Request previewTransform(PreviewTransformRequest previewRequest) throws IOException {
143143
String endpoint = new RequestConverters.EndpointBuilder()
144144
.addPathPartAsIs("_data_frame", "transforms", "_preview")
145145
.build();
@@ -148,7 +148,7 @@ static Request previewDataFrameTransform(PreviewDataFrameTransformRequest previe
148148
return request;
149149
}
150150

151-
static Request getDataFrameTransformStats(GetDataFrameTransformStatsRequest statsRequest) {
151+
static Request getTransformStats(GetTransformStatsRequest statsRequest) {
152152
String endpoint = new RequestConverters.EndpointBuilder()
153153
.addPathPartAsIs("_data_frame", "transforms")
154154
.addPathPart(statsRequest.getId())

‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DeleteDataFrameTransformRequest.java‎ renamed to ‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/DeleteTransformRequest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727

2828

2929
/**
30-
* Request to delete a data frame transform
30+
* Request to delete a transform
3131
*/
32-
public class DeleteDataFrameTransformRequest implements Validatable {
32+
public class DeleteTransformRequest implements Validatable {
3333

3434
public static final String FORCE = "force";
3535

3636
private final String id;
3737
private Boolean force;
3838

39-
public DeleteDataFrameTransformRequest(String id) {
39+
public DeleteTransformRequest(String id) {
4040
this.id = id;
4141
}
4242

@@ -56,7 +56,7 @@ public void setForce(boolean force) {
5656
public Optional<ValidationException> validate() {
5757
if (id == null) {
5858
ValidationException validationException = new ValidationException();
59-
validationException.addValidationError("data frame transform id must not be null");
59+
validationException.addValidationError("transform id must not be null");
6060
return Optional.of(validationException);
6161
} else {
6262
return Optional.empty();
@@ -77,7 +77,7 @@ public boolean equals(Object obj) {
7777
if (obj == null || getClass() != obj.getClass()) {
7878
return false;
7979
}
80-
DeleteDataFrameTransformRequest other = (DeleteDataFrameTransformRequest) obj;
80+
DeleteTransformRequest other = (DeleteTransformRequest) obj;
8181
return Objects.equals(id, other.id) && Objects.equals(force, other.force);
8282
}
8383
}

‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformRequest.java‎ renamed to ‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetTransformRequest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
import java.util.Objects;
2929
import java.util.Optional;
3030

31-
public class GetDataFrameTransformRequest implements Validatable {
31+
public class GetTransformRequest implements Validatable {
3232

3333
public static final String ALLOW_NO_MATCH = "allow_no_match";
3434
/**
35-
* Helper method to create a request that will get ALL Data Frame Transforms
36-
* @return new {@link GetDataFrameTransformRequest} object for the id "_all"
35+
* Helper method to create a request that will get ALL Transforms
36+
* @return new {@link GetTransformRequest} object for the id "_all"
3737
*/
38-
public static GetDataFrameTransformRequest getAllDataFrameTransformsRequest() {
39-
return new GetDataFrameTransformRequest("_all");
38+
public static GetTransformRequest getAllTransformRequest() {
39+
return new GetTransformRequest("_all");
4040
}
4141

4242
private final List<String> ids;
4343
private PageParams pageParams;
4444
private Boolean allowNoMatch;
4545

46-
public GetDataFrameTransformRequest(String... ids) {
46+
public GetTransformRequest(String... ids) {
4747
this.ids = Arrays.asList(ids);
4848
}
4949

@@ -71,7 +71,7 @@ public void setAllowNoMatch(Boolean allowNoMatch) {
7171
public Optional<ValidationException> validate() {
7272
if (ids == null || ids.isEmpty()) {
7373
ValidationException validationException = new ValidationException();
74-
validationException.addValidationError("data frame transform id must not be null");
74+
validationException.addValidationError("transform id must not be null");
7575
return Optional.of(validationException);
7676
} else {
7777
return Optional.empty();
@@ -92,7 +92,7 @@ public boolean equals(Object obj) {
9292
if (obj == null || getClass() != obj.getClass()) {
9393
return false;
9494
}
95-
GetDataFrameTransformRequest other = (GetDataFrameTransformRequest) obj;
95+
GetTransformRequest other = (GetTransformRequest) obj;
9696
return Objects.equals(ids, other.ids)
9797
&& Objects.equals(pageParams, other.pageParams)
9898
&& Objects.equals(allowNoMatch, other.allowNoMatch);

‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformResponse.java‎ renamed to ‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetTransformResponse.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.client.transform;
2121

22-
import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig;
22+
import org.elasticsearch.client.transform.transforms.TransformConfig;
2323
import org.elasticsearch.common.Nullable;
2424
import org.elasticsearch.common.ParseField;
2525
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
@@ -31,7 +31,7 @@
3131
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
3232
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
3333

34-
public class GetDataFrameTransformResponse {
34+
public class GetTransformResponse {
3535

3636
public static final ParseField TRANSFORMS = new ParseField("transforms");
3737
public static final ParseField INVALID_TRANSFORMS = new ParseField("invalid_transforms");
@@ -42,30 +42,30 @@ public class GetDataFrameTransformResponse {
4242
new ConstructingObjectParser<>("invalid_transforms", true, args -> new InvalidTransforms((List<String>) args[0]));
4343

4444
@SuppressWarnings("unchecked")
45-
static final ConstructingObjectParser<GetDataFrameTransformResponse, Void> PARSER = new ConstructingObjectParser<>(
46-
"get_data_frame_transform", true, args -> new GetDataFrameTransformResponse(
47-
(List<DataFrameTransformConfig>) args[0], (int) args[1], (InvalidTransforms) args[2]));
45+
static final ConstructingObjectParser<GetTransformResponse, Void> PARSER = new ConstructingObjectParser<>(
46+
"get_transform", true, args -> new GetTransformResponse(
47+
(List<TransformConfig>) args[0], (int) args[1], (InvalidTransforms) args[2]));
4848
static {
4949
// Discard the count field which is the size of the transforms array
5050
INVALID_TRANSFORMS_PARSER.declareInt((a, b) -> {}, COUNT);
5151
INVALID_TRANSFORMS_PARSER.declareStringArray(constructorArg(), TRANSFORMS);
5252

53-
PARSER.declareObjectArray(constructorArg(), DataFrameTransformConfig.PARSER::apply, TRANSFORMS);
53+
PARSER.declareObjectArray(constructorArg(), TransformConfig.PARSER::apply, TRANSFORMS);
5454
PARSER.declareInt(constructorArg(), COUNT);
5555
PARSER.declareObject(optionalConstructorArg(), INVALID_TRANSFORMS_PARSER::apply, INVALID_TRANSFORMS);
5656
}
5757

58-
public static GetDataFrameTransformResponse fromXContent(final XContentParser parser) {
59-
return GetDataFrameTransformResponse.PARSER.apply(parser, null);
58+
public static GetTransformResponse fromXContent(final XContentParser parser) {
59+
return GetTransformResponse.PARSER.apply(parser, null);
6060
}
6161

62-
private List<DataFrameTransformConfig> transformConfigurations;
62+
private List<TransformConfig> transformConfigurations;
6363
private int count;
6464
private InvalidTransforms invalidTransforms;
6565

66-
public GetDataFrameTransformResponse(List<DataFrameTransformConfig> transformConfigurations,
67-
int count,
68-
@Nullable InvalidTransforms invalidTransforms) {
66+
public GetTransformResponse(List<TransformConfig> transformConfigurations,
67+
int count,
68+
@Nullable InvalidTransforms invalidTransforms) {
6969
this.transformConfigurations = transformConfigurations;
7070
this.count = count;
7171
this.invalidTransforms = invalidTransforms;
@@ -80,7 +80,7 @@ public int getCount() {
8080
return count;
8181
}
8282

83-
public List<DataFrameTransformConfig> getTransformConfigurations() {
83+
public List<TransformConfig> getTransformConfigurations() {
8484
return transformConfigurations;
8585
}
8686

@@ -99,7 +99,7 @@ public boolean equals(Object other) {
9999
return false;
100100
}
101101

102-
final GetDataFrameTransformResponse that = (GetDataFrameTransformResponse) other;
102+
final GetTransformResponse that = (GetTransformResponse) other;
103103
return Objects.equals(this.transformConfigurations, that.transformConfigurations)
104104
&& Objects.equals(this.count, that.count)
105105
&& Objects.equals(this.invalidTransforms, that.invalidTransforms);

‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsRequest.java‎ renamed to ‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetTransformStatsRequest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import java.util.Objects;
2727
import java.util.Optional;
2828

29-
public class GetDataFrameTransformStatsRequest implements Validatable {
29+
public class GetTransformStatsRequest implements Validatable {
3030
private final String id;
3131
private PageParams pageParams;
3232
private Boolean allowNoMatch;
3333

34-
public GetDataFrameTransformStatsRequest(String id) {
34+
public GetTransformStatsRequest(String id) {
3535
this.id = id;
3636
}
3737

@@ -59,7 +59,7 @@ public void setAllowNoMatch(Boolean allowNoMatch) {
5959
public Optional<ValidationException> validate() {
6060
if (id == null) {
6161
ValidationException validationException = new ValidationException();
62-
validationException.addValidationError("data frame transform id must not be null");
62+
validationException.addValidationError("transform id must not be null");
6363
return Optional.of(validationException);
6464
} else {
6565
return Optional.empty();
@@ -80,7 +80,7 @@ public boolean equals(Object obj) {
8080
if (obj == null || getClass() != obj.getClass()) {
8181
return false;
8282
}
83-
GetDataFrameTransformStatsRequest other = (GetDataFrameTransformStatsRequest) obj;
83+
GetTransformStatsRequest other = (GetTransformStatsRequest) obj;
8484
return Objects.equals(id, other.id)
8585
&& Objects.equals(pageParams, other.pageParams)
8686
&& Objects.equals(allowNoMatch, other.allowNoMatch);

‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetDataFrameTransformStatsResponse.java‎ renamed to ‎client/rest-high-level/src/main/java/org/elasticsearch/client/transform/GetTransformStatsResponse.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.elasticsearch.ElasticsearchException;
2323
import org.elasticsearch.action.TaskOperationFailure;
24-
import org.elasticsearch.client.transform.transforms.DataFrameTransformStats;
24+
import org.elasticsearch.client.transform.transforms.TransformStats;
2525
import org.elasticsearch.common.Nullable;
2626
import org.elasticsearch.common.ParseField;
2727
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
@@ -34,19 +34,19 @@
3434
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
3535
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
3636

37-
public class GetDataFrameTransformStatsResponse {
37+
public class GetTransformStatsResponse {
3838

3939
public static final ParseField TRANSFORMS = new ParseField("transforms");
4040
public static final ParseField COUNT = new ParseField("count");
4141

4242
@SuppressWarnings("unchecked")
43-
static final ConstructingObjectParser<GetDataFrameTransformStatsResponse, Void> PARSER = new ConstructingObjectParser<>(
44-
"get_data_frame_transform_stats_response", true,
45-
args -> new GetDataFrameTransformStatsResponse((List<DataFrameTransformStats>) args[0],
43+
static final ConstructingObjectParser<GetTransformStatsResponse, Void> PARSER = new ConstructingObjectParser<>(
44+
"get_transform_stats_response", true,
45+
args -> new GetTransformStatsResponse((List<TransformStats>) args[0],
4646
(List<TaskOperationFailure>) args[1], (List<ElasticsearchException>) args[2]));
4747

4848
static {
49-
PARSER.declareObjectArray(constructorArg(), DataFrameTransformStats.PARSER::apply, TRANSFORMS);
49+
PARSER.declareObjectArray(constructorArg(), TransformStats.PARSER::apply, TRANSFORMS);
5050
// Discard the count field which is the size of the transforms array
5151
PARSER.declareInt((a, b) -> {}, COUNT);
5252
PARSER.declareObjectArray(optionalConstructorArg(), (p, c) -> TaskOperationFailure.fromXContent(p),
@@ -55,23 +55,23 @@ public class GetDataFrameTransformStatsResponse {
5555
AcknowledgedTasksResponse.NODE_FAILURES);
5656
}
5757

58-
public static GetDataFrameTransformStatsResponse fromXContent(final XContentParser parser) {
59-
return GetDataFrameTransformStatsResponse.PARSER.apply(parser, null);
58+
public static GetTransformStatsResponse fromXContent(final XContentParser parser) {
59+
return GetTransformStatsResponse.PARSER.apply(parser, null);
6060
}
6161

62-
private final List<DataFrameTransformStats> transformsStats;
62+
private final List<TransformStats> transformsStats;
6363
private final List<TaskOperationFailure> taskFailures;
6464
private final List<ElasticsearchException> nodeFailures;
6565

66-
public GetDataFrameTransformStatsResponse(List<DataFrameTransformStats> transformsStats,
66+
public GetTransformStatsResponse(List<TransformStats> transformsStats,
6767
@Nullable List<TaskOperationFailure> taskFailures,
6868
@Nullable List<? extends ElasticsearchException> nodeFailures) {
6969
this.transformsStats = transformsStats;
7070
this.taskFailures = taskFailures == null ? Collections.emptyList() : Collections.unmodifiableList(taskFailures);
7171
this.nodeFailures = nodeFailures == null ? Collections.emptyList() : Collections.unmodifiableList(nodeFailures);
7272
}
7373

74-
public List<DataFrameTransformStats> getTransformsStats() {
74+
public List<TransformStats> getTransformsStats() {
7575
return transformsStats;
7676
}
7777

@@ -98,7 +98,7 @@ public boolean equals(Object other) {
9898
return false;
9999
}
100100

101-
final GetDataFrameTransformStatsResponse that = (GetDataFrameTransformStatsResponse) other;
101+
final GetTransformStatsResponse that = (GetTransformStatsResponse) other;
102102
return Objects.equals(this.transformsStats, that.transformsStats)
103103
&& Objects.equals(this.nodeFailures, that.nodeFailures)
104104
&& Objects.equals(this.taskFailures, that.taskFailures);

0 commit comments

Comments
 (0)