Skip to content

Watcher: cleanup ensureWatchExists use #31926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 13, 2018
Merged

Watcher: cleanup ensureWatchExists use #31926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55c783b
Watcher: cleanup ensureWatchExists use
hub-cap Jul 10, 2018
f6e041a
Move the call to ensure watch to the begin of the ctor
hub-cap Jul 10, 2018
0c4b6f0
Merge remote-tracking branch 'upstream/master' into final_ensure_watch
hub-cap Jul 10, 2018
5f1ce34
Merge remote-tracking branch 'upstream/master' into final_ensure_watch
hub-cap Jul 10, 2018
645fce2
Merge remote-tracking branch 'upstream/master' into final_ensure_watch
hub-cap Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/elasticsearch/xpack/core/watcher/execution/WatchExecutionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public Watch watch() {
return watch;
}

public void ensureWatchExists(CheckedSupplier<Watch, Exception> supplier) throws Exception {
public final void ensureWatchExists(CheckedSupplier<Watch, Exception> supplier) throws Exception {
if (watch == null) {
watch = supplier.get();
}
Expand Down
21 changes: 5 additions & 16 deletions ...tcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ManualExecutionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
package org.elasticsearch.xpack.watcher.execution;

import org.elasticsearch.common.CheckedSupplier;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.xpack.core.watcher.actions.Action;
import org.elasticsearch.xpack.core.watcher.actions.ActionWrapper;
Expand All @@ -29,18 +28,19 @@ public class ManualExecutionContext extends WatchExecutionContext {
private final Map<String, ActionExecutionMode> actionModes;
private final boolean recordExecution;
private final boolean knownWatch;
private final Watch watch;

ManualExecutionContext(Watch watch, boolean knownWatch, DateTime executionTime, ManualTriggerEvent triggerEvent,
TimeValue defaultThrottlePeriod, Input.Result inputResult, Condition.Result conditionResult,
Map<String, ActionExecutionMode> actionModes, boolean recordExecution) {
Map<String, ActionExecutionMode> actionModes, boolean recordExecution) throws Exception {

super(watch.id(), executionTime, triggerEvent, defaultThrottlePeriod);

this.actionModes = actionModes;
this.recordExecution = recordExecution;
this.knownWatch = knownWatch;
this.watch = watch;

// set the watch early to ensure calls to watch() below succeed.
super.ensureWatchExists(() -> watch);

if (inputResult != null) {
onInputResult(inputResult);
Expand All @@ -66,12 +66,6 @@ public class ManualExecutionContext extends WatchExecutionContext {
}
}

// a noop operation, as the watch is already loaded via ctor
@Override
public void ensureWatchExists(CheckedSupplier<Watch, Exception> supplier) throws Exception {
super.ensureWatchExists(() -> watch);
}

@Override
public boolean knownWatch() {
return knownWatch;
Expand Down Expand Up @@ -107,11 +101,6 @@ public final boolean recordExecution() {
return recordExecution;
}

@Override
public Watch watch() {
return watch;
}

public static Builder builder(Watch watch, boolean knownWatch, ManualTriggerEvent event, TimeValue defaultThrottlePeriod) {
return new Builder(watch, knownWatch, event, defaultThrottlePeriod);
}
Expand Down Expand Up @@ -173,7 +162,7 @@ public Builder withCondition(Condition.Result conditionResult) {
return this;
}

public ManualExecutionContext build() {
public ManualExecutionContext build() throws Exception {
if (executionTime == null) {
executionTime = DateTime.now(DateTimeZone.UTC);
}
Expand Down