Tidy up Watcher components

Author: russcam

src/Nest/Nest.csproj

@@ -1381,13 +1381,13 @@
     <Compile Include="XPack\Watcher\Input\ConnectionScheme.cs" />
     <Compile Include="XPack\Watcher\Input\HttpInputProxy.cs" />
     <Compile Include="XPack\Watcher\Input\HttpMethod.cs" />
-    <Compile Include="XPack\Watcher\Input\IChainInput.cs" />
+    <Compile Include="XPack\Watcher\Input\ChainInput.cs" />
     <Compile Include="XPack\Watcher\Input\InputBase.cs" />
     <Compile Include="XPack\Watcher\Input\IndicesOptions.cs" />
     <Compile Include="XPack\Watcher\Input\InputType.cs" />
     <Compile Include="XPack\Watcher\Input\ResponseContentType.cs" />
     <Compile Include="XPack\Watcher\Input\SimpleInput.cs" />
-    <Compile Include="XPack\Watcher\PutWatch\Actions.cs" />
+    <Compile Include="XPack\Watcher\Action\Actions.cs" />
     <Compile Include="XPack\Watcher\RestartWatcher\ElasticClient-RestartWatcher.cs" />
     <Compile Include="XPack\Watcher\RestartWatcher\RestartWatcherResponse.cs" />
     <Compile Include="XPack\Watcher\Schedule\CronExpression.cs" />

…c/Nest/XPack/Watcher/PutWatch/Actions.cs src/Nest/XPack/Watcher/Action/Actions.cssrc/Nest/XPack/Watcher/PutWatch/Actions.cs renamed to src/Nest/XPack/Watcher/Action/Actions.cs src/Nest/XPack/Watcher/PutWatch/Actions.cs renamed to src/Nest/XPack/Watcher/Action/Actions.cs

@@ -34,13 +34,9 @@ private static IDictionary<string, IAction> ReduceCombinators(IDictionary<string
 			return reducedActions;
 		}
 
-		public Actions()
-		{
-		}
+		public Actions() {}
 
-		public Actions(IDictionary<string, IAction> actions) : base(ReduceCombinators(actions))
-		{
-		}
+		public Actions(IDictionary<string, IAction> actions) : base(ReduceCombinators(actions)) {}
 
 		public static implicit operator Actions(ActionBase action)
 		{
@@ -70,9 +66,7 @@ public static implicit operator Actions(ActionBase action)
 
 	public class ActionsDescriptor : IsADictionaryDescriptorBase<ActionsDescriptor, Actions, string, IAction>
 	{
-		public ActionsDescriptor() : base(new Actions())
-		{
-		}
+		public ActionsDescriptor() : base(new Actions()) {}
 
 		public ActionsDescriptor Email(string name, Func<EmailActionDescriptor, IEmailAction> selector) =>
 			Assign(name, selector.InvokeOrDefault(new EmailActionDescriptor(name)));

src/Nest/XPack/Watcher/Condition/AlwaysCondition.cs

@@ -2,7 +2,6 @@
 
 namespace Nest
 {
-
 	[JsonObject]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<AlwaysCondition>))]
 	public interface IAlwaysCondition : ICondition {}

src/Nest/XPack/Watcher/Condition/ConditionBase.cs

@@ -5,10 +5,8 @@ namespace Nest
 	[JsonObject]
 	public interface ICondition {}
 
-	public abstract class ConditionBase
+	public abstract class ConditionBase : ICondition
 	{
-
-
 		internal abstract void WrapInContainer(IConditionContainer container);
 	}
 }

src/Nest/XPack/Watcher/Condition/ConditionType.cs

@@ -14,6 +14,8 @@ public enum ConditionType
 		[EnumMember(Value="script")]
 		Script,
 		[EnumMember(Value = "compare")]
-		Compare
+		Compare,
+		[EnumMember(Value = "array_compare")]
+		ArrayCompare
 	}
 }

…/Nest/XPack/Watcher/Input/IChainInput.cs …c/Nest/XPack/Watcher/Input/ChainInput.cssrc/Nest/XPack/Watcher/Input/IChainInput.cs renamed to src/Nest/XPack/Watcher/Input/ChainInput.cs src/Nest/XPack/Watcher/Input/IChainInput.cs renamed to src/Nest/XPack/Watcher/Input/ChainInput.cs

@@ -37,10 +37,6 @@ public void Remove(string key)
 			_payload?.Remove(key);
 		}
 
-		public static implicit operator InputContainer(SimpleInput input) => input == null
-			? null
-			: new InputContainer(input);
-
 		internal override void WrapInContainer(IInputContainer container) => container.Simple = this;
 
 		public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
@@ -50,7 +46,7 @@ public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
 
 		IEnumerator IEnumerable.GetEnumerator()
 		{
-			return ((IEnumerable)_payload).GetEnumerator();
+			return this.GetEnumerator();
 		}
 	}
 

src/Nest/XPack/Watcher/Input/SimpleInput.cs

@@ -5,7 +5,7 @@ namespace Nest
 	[JsonObject]
 	public interface ISchedule {}
 
-	public abstract class ScheduleBase
+	public abstract class ScheduleBase : ISchedule
 	{
 		internal abstract void WrapInContainer(IScheduleContainer container);
 	}

src/Nest/XPack/Watcher/Schedule/ScheduleBase.cs

@@ -1,6 +1,8 @@
 namespace Nest
 {
-	public abstract class TriggerBase
+	public interface ITrigger {}
+
+	public abstract class TriggerBase : ITrigger
 	{
 		public static implicit operator TriggerContainer(TriggerBase trigger) => trigger == null
 			? null