honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ML] Rename Condition member valueFilter -> value (elastic/x-pack-elasticsearch#3599) 

Original commit: elastic/x-pack-elasticsearch@5ef8415ca5
This commit is contained in:
Dimitris Athanasiou 2018-01-17 18:39:47 +00:00 committed by GitHub
parent dda3a8dee0
commit f91631664a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugin/core/src/main/java/org/elasticsearch/xpack/ml/job/config/Condition.java
View File

@ -29,7 +29,7 @@ import java.util.regex.PatternSyntaxException;
*/ */
public class Condition implements ToXContentObject, Writeable { public class Condition implements ToXContentObject, Writeable {
public static final ParseField CONDITION_FIELD = new ParseField("condition"); public static final ParseField CONDITION_FIELD = new ParseField("condition");
public static final ParseField FILTER_VALUE_FIELD = new ParseField("value"); public static final ParseField VALUE_FIELD = new ParseField("value");
public static final ConstructingObjectParser<Condition, Void> PARSER = new ConstructingObjectParser<>( public static final ConstructingObjectParser<Condition, Void> PARSER = new ConstructingObjectParser<>(
CONDITION_FIELD.getPreferredName(), a -> new Condition((Operator) a[0], (String) a[1])); CONDITION_FIELD.getPreferredName(), a -> new Condition((Operator) a[0], (String) a[1]));
@ -49,45 +49,45 @@ public class Condition implements ToXContentObject, Writeable {
return null; return null;
} }
throw new IllegalArgumentException("Unsupported token [" + p.currentToken() + "]"); throw new IllegalArgumentException("Unsupported token [" + p.currentToken() + "]");
}, FILTER_VALUE_FIELD, ValueType.STRING_OR_NULL); }, VALUE_FIELD, ValueType.STRING_OR_NULL);
} }
private final Operator op; private final Operator op;
private final String filterValue; private final String value;
public Condition(StreamInput in) throws IOException { public Condition(StreamInput in) throws IOException {
op = Operator.readFromStream(in); op = Operator.readFromStream(in);
filterValue = in.readOptionalString(); value = in.readOptionalString();
} }
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
op.writeTo(out); op.writeTo(out);
out.writeOptionalString(filterValue); out.writeOptionalString(value);
} }
public Condition(Operator op, String filterValue) { public Condition(Operator op, String value) {
if (filterValue == null) { if (value == null) {
throw ExceptionsHelper.badRequestException(Messages.getMessage(Messages.JOB_CONFIG_CONDITION_INVALID_VALUE_NULL)); throw ExceptionsHelper.badRequestException(Messages.getMessage(Messages.JOB_CONFIG_CONDITION_INVALID_VALUE_NULL));
} }
if (op.expectsANumericArgument()) { if (op.expectsANumericArgument()) {
try { try {
Double.parseDouble(filterValue); Double.parseDouble(value);
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
String msg = Messages.getMessage(Messages.JOB_CONFIG_CONDITION_INVALID_VALUE_NUMBER, filterValue); String msg = Messages.getMessage(Messages.JOB_CONFIG_CONDITION_INVALID_VALUE_NUMBER, value);
throw ExceptionsHelper.badRequestException(msg); throw ExceptionsHelper.badRequestException(msg);
} }
} else { } else {
try { try {
Pattern.compile(filterValue); Pattern.compile(value);
} catch (PatternSyntaxException e) { } catch (PatternSyntaxException e) {
String msg = Messages.getMessage(Messages.JOB_CONFIG_CONDITION_INVALID_VALUE_REGEX, filterValue); String msg = Messages.getMessage(Messages.JOB_CONFIG_CONDITION_INVALID_VALUE_REGEX, value);
throw ExceptionsHelper.badRequestException(msg); throw ExceptionsHelper.badRequestException(msg);
} }
} }
this.op = op; this.op = op;
this.filterValue = filterValue; this.value = value;
} }
public Operator getOperator() { public Operator getOperator() {
@ -95,21 +95,21 @@ public class Condition implements ToXContentObject, Writeable {
} }
public String getValue() { public String getValue() {
return filterValue; return value;
} }
@Override @Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(); builder.startObject();
builder.field(Operator.OPERATOR_FIELD.getPreferredName(), op); builder.field(Operator.OPERATOR_FIELD.getPreferredName(), op);
builder.field(FILTER_VALUE_FIELD.getPreferredName(), filterValue); builder.field(VALUE_FIELD.getPreferredName(), value);
builder.endObject(); builder.endObject();
return builder; return builder;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(op, filterValue); return Objects.hash(op, value);
} }
@Override @Override
@ -127,6 +127,6 @@ public class Condition implements ToXContentObject, Writeable {
Condition other = (Condition) obj; Condition other = (Condition) obj;
return Objects.equals(this.op, other.op) && return Objects.equals(this.op, other.op) &&
Objects.equals(this.filterValue, other.filterValue); Objects.equals(this.value, other.value);
} }
} }