Skip to content

Commit

Permalink
[Transform] rename data frame transform to transform for hlrc client (#…
Browse files Browse the repository at this point in the history 
…46933)

rename data frame transform to transform for hlrc
  • Loading branch information
Hendrik Muhs authored Sep 25, 2019
1 parent 0776153 commit fd3dc4d
Show file tree
Hide file tree
Showing 90 changed files with 1,258 additions and 1,258 deletions.
6 changes: 3 additions & 3 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public class RestHighLevelClient implements Closeable {
private final IndexLifecycleClient ilmClient = new IndexLifecycleClient(this);
private final RollupClient rollupClient = new RollupClient(this);
private final CcrClient ccrClient = new CcrClient(this);
private final DataFrameClient dataFrameClient = new DataFrameClient(this);
private final TransformClient transformClient = new TransformClient(this);

/**
* Creates a {@link RestHighLevelClient} given the low level {@link RestClientBuilder} that allows to build the
Expand Down Expand Up @@ -477,8 +477,8 @@ public SecurityClient security() {
*
* @return the client wrapper for making Data Frame API calls
*/
public DataFrameClient dataFrame() {
return dataFrameClient;
public TransformClient transform() {
return transformClient;
}

/**
Expand Down
164 changes: 82 additions & 82 deletions ...elasticsearch/client/DataFrameClient.java → ...elasticsearch/client/TransformClient.java
View file

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions ...ch/client/DataFrameRequestConverters.java → ...ch/client/TransformRequestConverters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.elasticsearch.client.core.PageParams;
import org.elasticsearch.client.transform.DeleteDataFrameTransformRequest;
import org.elasticsearch.client.transform.GetDataFrameTransformRequest;
import org.elasticsearch.client.transform.GetDataFrameTransformStatsRequest;
import org.elasticsearch.client.transform.PreviewDataFrameTransformRequest;
import org.elasticsearch.client.transform.PutDataFrameTransformRequest;
import org.elasticsearch.client.transform.StartDataFrameTransformRequest;
import org.elasticsearch.client.transform.StopDataFrameTransformRequest;
import org.elasticsearch.client.transform.UpdateDataFrameTransformRequest;
import org.elasticsearch.client.transform.DeleteTransformRequest;
import org.elasticsearch.client.transform.GetTransformRequest;
import org.elasticsearch.client.transform.GetTransformStatsRequest;
import org.elasticsearch.client.transform.PreviewTransformRequest;
import org.elasticsearch.client.transform.PutTransformRequest;
import org.elasticsearch.client.transform.StartTransformRequest;
import org.elasticsearch.client.transform.StopTransformRequest;
import org.elasticsearch.client.transform.UpdateTransformRequest;
import org.elasticsearch.common.Strings;

import java.io.IOException;

import static org.elasticsearch.client.RequestConverters.REQUEST_BODY_CONTENT_TYPE;
import static org.elasticsearch.client.RequestConverters.createEntity;
import static org.elasticsearch.client.transform.DeleteDataFrameTransformRequest.FORCE;
import static org.elasticsearch.client.transform.GetDataFrameTransformRequest.ALLOW_NO_MATCH;
import static org.elasticsearch.client.transform.PutDataFrameTransformRequest.DEFER_VALIDATION;
import static org.elasticsearch.client.transform.DeleteTransformRequest.FORCE;
import static org.elasticsearch.client.transform.GetTransformRequest.ALLOW_NO_MATCH;
import static org.elasticsearch.client.transform.PutTransformRequest.DEFER_VALIDATION;

final class DataFrameRequestConverters {
final class TransformRequestConverters {

private DataFrameRequestConverters() {}
private TransformRequestConverters() {}

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

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

static Request getDataFrameTransform(GetDataFrameTransformRequest getRequest) {
static Request getTransform(GetTransformRequest getRequest) {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_data_frame", "transforms")
.addPathPart(Strings.collectionToCommaDelimitedString(getRequest.getId()))
Expand All @@ -91,7 +91,7 @@ static Request getDataFrameTransform(GetDataFrameTransformRequest getRequest) {
return request;
}

static Request deleteDataFrameTransform(DeleteDataFrameTransformRequest deleteRequest) {
static Request deleteTransform(DeleteTransformRequest deleteRequest) {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_data_frame", "transforms")
.addPathPart(deleteRequest.getId())
Expand All @@ -103,7 +103,7 @@ static Request deleteDataFrameTransform(DeleteDataFrameTransformRequest deleteRe
return request;
}

static Request startDataFrameTransform(StartDataFrameTransformRequest startRequest) {
static Request startTransform(StartTransformRequest startRequest) {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_data_frame", "transforms")
.addPathPart(startRequest.getId())
Expand All @@ -118,7 +118,7 @@ static Request startDataFrameTransform(StartDataFrameTransformRequest startReque
return request;
}

static Request stopDataFrameTransform(StopDataFrameTransformRequest stopRequest) {
static Request stopTransform(StopTransformRequest stopRequest) {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_data_frame", "transforms")
.addPathPart(stopRequest.getId())
Expand All @@ -139,7 +139,7 @@ static Request stopDataFrameTransform(StopDataFrameTransformRequest stopRequest)
return request;
}

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

static Request getDataFrameTransformStats(GetDataFrameTransformStatsRequest statsRequest) {
static Request getTransformStats(GetTransformStatsRequest statsRequest) {
String endpoint = new RequestConverters.EndpointBuilder()
.addPathPartAsIs("_data_frame", "transforms")
.addPathPart(statsRequest.getId())
Expand Down
10 changes: 5 additions & 5 deletions ...form/DeleteDataFrameTransformRequest.java → ...ent/transform/DeleteTransformRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@


/**
* Request to delete a data frame transform
* Request to delete a transform
*/
public class DeleteDataFrameTransformRequest implements Validatable {
public class DeleteTransformRequest implements Validatable {

public static final String FORCE = "force";

private final String id;
private Boolean force;

public DeleteDataFrameTransformRequest(String id) {
public DeleteTransformRequest(String id) {
this.id = id;
}

Expand All @@ -56,7 +56,7 @@ public void setForce(boolean force) {
public Optional<ValidationException> validate() {
if (id == null) {
ValidationException validationException = new ValidationException();
validationException.addValidationError("data frame transform id must not be null");
validationException.addValidationError("transform id must not be null");
return Optional.of(validationException);
} else {
return Optional.empty();
Expand All @@ -77,7 +77,7 @@ public boolean equals(Object obj) {
if (obj == null || getClass() != obj.getClass()) {
return false;
}
DeleteDataFrameTransformRequest other = (DeleteDataFrameTransformRequest) obj;
DeleteTransformRequest other = (DeleteTransformRequest) obj;
return Objects.equals(id, other.id) && Objects.equals(force, other.force);
}
}
16 changes: 8 additions & 8 deletions ...ansform/GetDataFrameTransformRequest.java → ...client/transform/GetTransformRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
import java.util.Objects;
import java.util.Optional;

public class GetDataFrameTransformRequest implements Validatable {
public class GetTransformRequest implements Validatable {

public static final String ALLOW_NO_MATCH = "allow_no_match";
/**
* Helper method to create a request that will get ALL Data Frame Transforms
* @return new {@link GetDataFrameTransformRequest} object for the id "_all"
* Helper method to create a request that will get ALL Transforms
* @return new {@link GetTransformRequest} object for the id "_all"
*/
public static GetDataFrameTransformRequest getAllDataFrameTransformsRequest() {
return new GetDataFrameTransformRequest("_all");
public static GetTransformRequest getAllTransformRequest() {
return new GetTransformRequest("_all");
}

private final List<String> ids;
private PageParams pageParams;
private Boolean allowNoMatch;

public GetDataFrameTransformRequest(String... ids) {
public GetTransformRequest(String... ids) {
this.ids = Arrays.asList(ids);
}

Expand Down Expand Up @@ -71,7 +71,7 @@ public void setAllowNoMatch(Boolean allowNoMatch) {
public Optional<ValidationException> validate() {
if (ids == null || ids.isEmpty()) {
ValidationException validationException = new ValidationException();
validationException.addValidationError("data frame transform id must not be null");
validationException.addValidationError("transform id must not be null");
return Optional.of(validationException);
} else {
return Optional.empty();
Expand All @@ -92,7 +92,7 @@ public boolean equals(Object obj) {
if (obj == null || getClass() != obj.getClass()) {
return false;
}
GetDataFrameTransformRequest other = (GetDataFrameTransformRequest) obj;
GetTransformRequest other = (GetTransformRequest) obj;
return Objects.equals(ids, other.ids)
&& Objects.equals(pageParams, other.pageParams)
&& Objects.equals(allowNoMatch, other.allowNoMatch);
Expand Down
28 changes: 14 additions & 14 deletions ...nsform/GetDataFrameTransformResponse.java → ...lient/transform/GetTransformResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.elasticsearch.client.transform;

import org.elasticsearch.client.transform.transforms.DataFrameTransformConfig;
import org.elasticsearch.client.transform.transforms.TransformConfig;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
Expand All @@ -31,7 +31,7 @@
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;

public class GetDataFrameTransformResponse {
public class GetTransformResponse {

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

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

PARSER.declareObjectArray(constructorArg(), DataFrameTransformConfig.PARSER::apply, TRANSFORMS);
PARSER.declareObjectArray(constructorArg(), TransformConfig.PARSER::apply, TRANSFORMS);
PARSER.declareInt(constructorArg(), COUNT);
PARSER.declareObject(optionalConstructorArg(), INVALID_TRANSFORMS_PARSER::apply, INVALID_TRANSFORMS);
}

public static GetDataFrameTransformResponse fromXContent(final XContentParser parser) {
return GetDataFrameTransformResponse.PARSER.apply(parser, null);
public static GetTransformResponse fromXContent(final XContentParser parser) {
return GetTransformResponse.PARSER.apply(parser, null);
}

private List<DataFrameTransformConfig> transformConfigurations;
private List<TransformConfig> transformConfigurations;
private int count;
private InvalidTransforms invalidTransforms;

public GetDataFrameTransformResponse(List<DataFrameTransformConfig> transformConfigurations,
int count,
@Nullable InvalidTransforms invalidTransforms) {
public GetTransformResponse(List<TransformConfig> transformConfigurations,
int count,
@Nullable InvalidTransforms invalidTransforms) {
this.transformConfigurations = transformConfigurations;
this.count = count;
this.invalidTransforms = invalidTransforms;
Expand All @@ -80,7 +80,7 @@ public int getCount() {
return count;
}

public List<DataFrameTransformConfig> getTransformConfigurations() {
public List<TransformConfig> getTransformConfigurations() {
return transformConfigurations;
}

Expand All @@ -99,7 +99,7 @@ public boolean equals(Object other) {
return false;
}

final GetDataFrameTransformResponse that = (GetDataFrameTransformResponse) other;
final GetTransformResponse that = (GetTransformResponse) other;
return Objects.equals(this.transformConfigurations, that.transformConfigurations)
&& Objects.equals(this.count, that.count)
&& Objects.equals(this.invalidTransforms, that.invalidTransforms);
Expand Down
8 changes: 4 additions & 4 deletions ...rm/GetDataFrameTransformStatsRequest.java → ...t/transform/GetTransformStatsRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
import java.util.Objects;
import java.util.Optional;

public class GetDataFrameTransformStatsRequest implements Validatable {
public class GetTransformStatsRequest implements Validatable {
private final String id;
private PageParams pageParams;
private Boolean allowNoMatch;

public GetDataFrameTransformStatsRequest(String id) {
public GetTransformStatsRequest(String id) {
this.id = id;
}

Expand Down Expand Up @@ -59,7 +59,7 @@ public void setAllowNoMatch(Boolean allowNoMatch) {
public Optional<ValidationException> validate() {
if (id == null) {
ValidationException validationException = new ValidationException();
validationException.addValidationError("data frame transform id must not be null");
validationException.addValidationError("transform id must not be null");
return Optional.of(validationException);
} else {
return Optional.empty();
Expand All @@ -80,7 +80,7 @@ public boolean equals(Object obj) {
if (obj == null || getClass() != obj.getClass()) {
return false;
}
GetDataFrameTransformStatsRequest other = (GetDataFrameTransformStatsRequest) obj;
GetTransformStatsRequest other = (GetTransformStatsRequest) obj;
return Objects.equals(id, other.id)
&& Objects.equals(pageParams, other.pageParams)
&& Objects.equals(allowNoMatch, other.allowNoMatch);
Expand Down
24 changes: 12 additions & 12 deletions ...m/GetDataFrameTransformStatsResponse.java → .../transform/GetTransformStatsResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.TaskOperationFailure;
import org.elasticsearch.client.transform.transforms.DataFrameTransformStats;
import org.elasticsearch.client.transform.transforms.TransformStats;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
Expand All @@ -34,19 +34,19 @@
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;

public class GetDataFrameTransformStatsResponse {
public class GetTransformStatsResponse {

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

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

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

public static GetDataFrameTransformStatsResponse fromXContent(final XContentParser parser) {
return GetDataFrameTransformStatsResponse.PARSER.apply(parser, null);
public static GetTransformStatsResponse fromXContent(final XContentParser parser) {
return GetTransformStatsResponse.PARSER.apply(parser, null);
}

private final List<DataFrameTransformStats> transformsStats;
private final List<TransformStats> transformsStats;
private final List<TaskOperationFailure> taskFailures;
private final List<ElasticsearchException> nodeFailures;

public GetDataFrameTransformStatsResponse(List<DataFrameTransformStats> transformsStats,
public GetTransformStatsResponse(List<TransformStats> transformsStats,
@Nullable List<TaskOperationFailure> taskFailures,
@Nullable List<? extends ElasticsearchException> nodeFailures) {
this.transformsStats = transformsStats;
this.taskFailures = taskFailures == null ? Collections.emptyList() : Collections.unmodifiableList(taskFailures);
this.nodeFailures = nodeFailures == null ? Collections.emptyList() : Collections.unmodifiableList(nodeFailures);
}

public List<DataFrameTransformStats> getTransformsStats() {
public List<TransformStats> getTransformsStats() {
return transformsStats;
}

Expand All @@ -98,7 +98,7 @@ public boolean equals(Object other) {
return false;
}

final GetDataFrameTransformStatsResponse that = (GetDataFrameTransformStatsResponse) other;
final GetTransformStatsResponse that = (GetTransformStatsResponse) other;
return Objects.equals(this.transformsStats, that.transformsStats)
&& Objects.equals(this.nodeFailures, that.nodeFailures)
&& Objects.equals(this.taskFailures, that.taskFailures);
Expand Down
Loading

0 comments on commit fd3dc4d

Please sign in to comment.