honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-07 21:48:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bad rebase merge

Browse Source 
Original commit: elastic/x-pack-elasticsearch@a6793fedf8
This commit is contained in:
uboness 2015-05-22 12:45:39 +02:00
parent 575208c338
commit 33bc0761e7
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/elasticsearch/watcher/actions/throttler/PeriodThrottler.java
View File

@ -9,7 +9,6 @@ import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.joda.time.PeriodType; import org.elasticsearch.common.joda.time.PeriodType;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.watcher.actions.ActionStatus; import org.elasticsearch.watcher.actions.ActionStatus;
import org.elasticsearch.watcher.actions.throttler.Throttler;
import org.elasticsearch.watcher.execution.WatchExecutionContext; import org.elasticsearch.watcher.execution.WatchExecutionContext;
import org.elasticsearch.watcher.support.clock.Clock; import org.elasticsearch.watcher.support.clock.Clock;

9
src/main/java/org/elasticsearch/watcher/watch/Watch.java
View File

@ -287,19 +287,10 @@ public class Watch implements TriggerEngine.Job, ToXContent {
} else if (Field.TRANSFORM.match(currentFieldName)) { } else if (Field.TRANSFORM.match(currentFieldName)) {
transform = transformRegistry.parse(id, parser); transform = transformRegistry.parse(id, parser);
} else if (Field.THROTTLE_PERIOD.match(currentFieldName)) { } else if (Field.THROTTLE_PERIOD.match(currentFieldName)) {
<<<<<<< HEAD
if (token == XContentParser.Token.VALUE_STRING) {
throttlePeriod = TimeValue.parseTimeValue(parser.text(), null);
} else if (token == XContentParser.Token.VALUE_NUMBER) {
throttlePeriod = TimeValue.timeValueMillis(parser.longValue());
} else {
throw new ParseException("could not parse watch [{}]. expected field [{}] to either be string or numeric, but found [{}] instead", id, currentFieldName, token);
=======
try { try {
throttlePeriod = WatcherDateTimeUtils.parseTimeValue(parser, null); throttlePeriod = WatcherDateTimeUtils.parseTimeValue(parser, null);
} catch (WatcherDateTimeUtils.ParseException pe) { } catch (WatcherDateTimeUtils.ParseException pe) {
throw new ParseException("could not parse watch [{}]. failed to parse time value for field [{}]", pe, id, currentFieldName); throw new ParseException("could not parse watch [{}]. failed to parse time value for field [{}]", pe, id, currentFieldName);
>>>>>>> Centralized xcontent parsing of time values
} }
} else if (Field.ACTIONS.match(currentFieldName)) { } else if (Field.ACTIONS.match(currentFieldName)) {
actions = actionRegistry.parseActions(id, parser); actions = actionRegistry.parseActions(id, parser);