Fix alerting deserialization

russcam · russcam · commit 46dff7aa3052 · 2018-05-31T16:42:15.000+10:00
Closes #3237 (cherry picked from commit e285f77)
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -43,7 +43,7 @@
     <!-- Step 1 Check if lockfile is properly restored -->
     <PropertyGroup>
       <PaketRestoreRequired>true</PaketRestoreRequired>
-      <NoWarn>$(NoWarn);NU1603</NoWarn>
+      <NoWarn>$(NoWarn);NU1603;NU1604;NU1605;NU1608</NoWarn>
     </PropertyGroup>
 
     <!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
@@ -69,9 +69,11 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
+
     <!-- Do a global restore if required -->
     <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
-    <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" />
 
     <!-- Step 2 Detect project specific changes -->
     <PropertyGroup>
diff --git a/src/Nest/XPack/Watcher/Action/ActionBase.cs b/src/Nest/XPack/Watcher/Action/ActionBase.cs
@@ -25,10 +25,9 @@ public interface IAction
 
 	public abstract class ActionBase : IAction
 	{
-		protected ActionBase(string name)
-		{
-			this.Name = name;
-		}
+		internal ActionBase() {}
+
+		protected ActionBase(string name) => this.Name = name;
 
 		public string Name { get; set; }
 
@@ -42,10 +41,8 @@ protected ActionBase(string name)
 
 		public static bool operator true(ActionBase a) => false;
 
-		public static ActionBase operator &(ActionBase left, ActionBase right)
-		{
-			return new ActionCombinator(left, right);
-		}
+		public static ActionBase operator &(ActionBase left, ActionBase right) =>
+			new ActionCombinator(left, right);
 	}
 
 	internal class ActionCombinator : ActionBase, IAction
diff --git a/src/Nest/XPack/Watcher/Action/Email/EmailAttachments.cs b/src/Nest/XPack/Watcher/Action/Email/EmailAttachments.cs
@@ -4,9 +4,9 @@
 
 namespace Nest
 {
+	[JsonConverter(typeof(EmailAttachmentsJsonConverter))]
 	public interface IEmailAttachments : IIsADictionary<string, IEmailAttachment> {}
 
-	[JsonConverter(typeof(EmailAttachmentsJsonConverter))]
 	public class EmailAttachments : IsADictionaryBase<string, IEmailAttachment>, IEmailAttachments
 	{
 		public EmailAttachments() {}
@@ -34,7 +34,7 @@ internal class EmailAttachmentsJsonConverter : JsonConverter
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			writer.WriteStartObject();
-			var attachments = value as IDictionary<string, IEmailAttachment>;
+			var attachments = (IDictionary<string, IEmailAttachment>)value;
 			if (attachments != null)
 			{
 				foreach (var attachment in attachments)
@@ -67,9 +67,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				{
 					var name = (string)reader.Value;
 					IEmailAttachment attachment;
+
+					reader.Read();
+					reader.Read();
+					var type = (string)reader.Value;
 					reader.Read();
 
-					var type = reader.ReadAsString();
 					switch (type)
 					{
 						case "http":
diff --git a/src/Nest/XPack/Watcher/Action/Email/HttpAttachment.cs b/src/Nest/XPack/Watcher/Action/Email/HttpAttachment.cs
@@ -14,6 +14,7 @@ public interface IHttpAttachment : IEmailAttachment
 		bool? Inline { get; set; }
 
 		[JsonProperty("request")]
+		[JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequest>))]
 		IHttpInputRequest Request { get; set; }
 	}
 
diff --git a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyAction.cs b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyAction.cs
@@ -7,6 +7,7 @@
 namespace Nest
 {
 	[JsonObject]
+	[ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<PagerDutyAction>))]
 	public interface IPagerDutyAction : IAction, IPagerDutyEvent { }
 
 	public class PagerDutyAction : ActionBase, IPagerDutyAction
diff --git a/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyEvent.cs b/src/Nest/XPack/Watcher/Action/PagerDuty/PagerDutyEvent.cs
@@ -4,7 +4,7 @@
 namespace Nest
 {
 	[JsonObject]
-	[JsonConverter(typeof(ReadAsTypeJsonConverter<PagerDutyEvent>))]
+	[ContractJsonConverter(typeof(ReadAsTypeJsonConverter<PagerDutyEvent>))]
 	public interface IPagerDutyEvent
 	{
 		[JsonProperty("account")]
diff --git a/src/Nest/XPack/Watcher/Action/Webhook/WebhookAction.cs b/src/Nest/XPack/Watcher/Action/Webhook/WebhookAction.cs
@@ -5,6 +5,7 @@
 namespace Nest
 {
 	[JsonObject]
+	[ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<WebhookAction>))]
 	public interface IWebhookAction : IAction, IHttpInputRequest
 	{
 	}
diff --git a/src/Nest/XPack/Watcher/Execution/HttpInputRequestResult.cs b/src/Nest/XPack/Watcher/Execution/HttpInputRequestResult.cs
@@ -3,6 +3,6 @@
 namespace Nest
 {
 	[JsonObject]
-	[JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequestResult>))]
+	[ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequestResult>))]
 	public class HttpInputRequestResult : HttpInputRequest {}
 }
diff --git a/src/Nest/XPack/Watcher/Input/ChainInput.cs b/src/Nest/XPack/Watcher/Input/ChainInput.cs
@@ -94,7 +94,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			{
 				if (reader.TokenType == JsonToken.StartObject)
 				{
-					var name = reader.ReadAsString();
+					reader.Read();
+					var name = (string)reader.Value;
+					reader.Read();
 					var input = (InputContainer)serializer.Deserialize<IInputContainer>(reader);
 
 					inputs.Add(name, input);
diff --git a/src/Nest/XPack/Watcher/Input/HttpInputAuthentication.cs b/src/Nest/XPack/Watcher/Input/HttpInputAuthentication.cs
@@ -7,6 +7,7 @@ namespace Nest
 	/// The Authentication mechanism for a request to a HTTP endpoint
 	/// </summary>
 	[JsonObject]
+	[JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputAuthentication>))]
 	public interface IHttpInputAuthentication
 	{
 		/// <summary>
diff --git a/src/Nest/XPack/Watcher/Input/HttpInputRequest.cs b/src/Nest/XPack/Watcher/Input/HttpInputRequest.cs
@@ -6,7 +6,7 @@
 namespace Nest
 {
 	[JsonObject]
-	[JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequest>))]
+	[ContractJsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequest>))]
 	public interface IHttpInputRequest
 	{
 		/// <summary>
diff --git a/src/Nest/XPack/Watcher/Input/SearchInput.cs b/src/Nest/XPack/Watcher/Input/SearchInput.cs
@@ -35,7 +35,7 @@ public interface ISearchInput : IInput
 		Time Timeout { get; set; }
 	}
 
-	/// <inheritdoc />
+	/// <inheritdoc cref="ISearchInput"/>
 	public class SearchInput : InputBase, ISearchInput
 	{
 		/// <inheritdoc />
@@ -50,25 +50,25 @@ public class SearchInput : InputBase, ISearchInput
 		internal override void WrapInContainer(IInputContainer container) => container.Search = this;
 	}
 
-	/// <inheritdoc />
+	/// <inheritdoc cref="ISearchInput"/>
 	public class SearchInputDescriptor
 		: DescriptorBase<SearchInputDescriptor, ISearchInput>, ISearchInput
 	{
 		IEnumerable<string> ISearchInput.Extract { get; set; }
 		ISearchInputRequest ISearchInput.Request { get; set; }
 		Time ISearchInput.Timeout { get; set; }
 
-		/// <inheritdoc />
+		/// <inheritdoc cref="ISearchInput.Request"/>
 		public SearchInputDescriptor Request(Func<SearchInputRequestDescriptor, ISearchInputRequest> selector) =>
 			Assign(a => a.Request = selector?.InvokeOrDefault(new SearchInputRequestDescriptor()));
 
-		/// <inheritdoc />
+		/// <inheritdoc cref="ISearchInput.Extract"/>
 		public SearchInputDescriptor Extract(IEnumerable<string> extract) => Assign(a => a.Extract = extract);
 
-		/// <inheritdoc />
+		/// <inheritdoc cref="ISearchInput.Extract"/>
 		public SearchInputDescriptor Extract(params string[] extract) => Assign(a => a.Extract = extract);
 
-		/// <inheritdoc />
+		/// <inheritdoc cref="ISearchInput.Timeout"/>
 		public SearchInputDescriptor Timeout(Time timeout) => Assign(a => a.Timeout = timeout);
 	}
 }
diff --git a/src/Nest/XPack/Watcher/PutWatch/ElasticClient-PutWatch.cs b/src/Nest/XPack/Watcher/PutWatch/ElasticClient-PutWatch.cs
@@ -14,13 +14,13 @@ public partial interface IElasticClient
 		/// </summary>
 		IPutWatchResponse PutWatch(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null);
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})"/>
 		IPutWatchResponse PutWatch(IPutWatchRequest request);
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})"/>
 		Task<IPutWatchResponse> PutWatchAsync(Id watchId, Func<PutWatchDescriptor, IPutWatchRequest> selector = null, CancellationToken cancellationToken = default(CancellationToken));
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="PutWatch(Nest.Id,System.Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})"/>
 		Task<IPutWatchResponse> PutWatchAsync(IPutWatchRequest request, CancellationToken cancellationToken = default(CancellationToken));
 	}
 
diff --git a/src/Nest/XPack/Watcher/PutWatch/PutWatchRequest.cs b/src/Nest/XPack/Watcher/PutWatch/PutWatchRequest.cs
@@ -5,7 +5,7 @@
 namespace Nest
 {
 	/// <summary>
-	/// A <see cref="IElasticClient.PutWatch(Nest.Id,Func{Nest.PutWatchDescriptor,Nest.IPutWatchRequest})" /> request
+	/// A PutWatch request
 	/// </summary>
 	public partial interface IPutWatchRequest
 	{
@@ -56,7 +56,7 @@ public partial interface IPutWatchRequest
 		TransformContainer Transform { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc cref="IPutWatchRequest"/>
 	public partial class PutWatchRequest
 	{
 		public PutWatchRequest() {}
@@ -83,7 +83,7 @@ public PutWatchRequest() {}
 		public Actions Actions { get; set; }
 	}
 
-	/// <inheritdoc/>
+	/// <inheritdoc cref="IPutWatchRequest"/>
 	[DescriptorFor("XpackWatcherPutWatch")]
 	public partial class PutWatchDescriptor
 	{
@@ -97,34 +97,34 @@ public PutWatchDescriptor() {}
 		TransformContainer IPutWatchRequest.Transform { get; set; }
 		TriggerContainer IPutWatchRequest.Trigger { get; set; }
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.Actions"/>
 		public PutWatchDescriptor Actions(Func<ActionsDescriptor, IPromise<Actions>> actions) =>
 			Assign(a => a.Actions = actions?.Invoke(new ActionsDescriptor())?.Value);
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.Condition"/>
 		public PutWatchDescriptor Condition(Func<ConditionDescriptor, ConditionContainer> selector) =>
 			Assign(a => a.Condition = selector.InvokeOrDefault(new ConditionDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.Input"/>
 		public PutWatchDescriptor Input(Func<InputDescriptor, InputContainer> selector) =>
 			Assign(a => a.Input = selector.InvokeOrDefault(new InputDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.Metadata"/>
 		public PutWatchDescriptor Metadata(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramsDictionary) =>
 			Assign(a => a.Metadata = paramsDictionary(new FluentDictionary<string, object>()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.Metadata"/>
 		public PutWatchDescriptor Metadata(Dictionary<string, object> paramsDictionary) =>
 			Assign(a => a.Metadata = paramsDictionary);
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.ThrottlePeriod"/>
 		public PutWatchDescriptor ThrottlePeriod(string throttlePeriod) => Assign(a => a.ThrottlePeriod = throttlePeriod);
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.Transform"/>
 		public PutWatchDescriptor Transform(Func<TransformDescriptor, TransformContainer> selector) =>
 			Assign(a => a.Transform = selector.InvokeOrDefault(new TransformDescriptor()));
 
-		/// <inheritdoc/>
+		/// <inheritdoc cref="IPutWatchRequest.Trigger"/>
 		public PutWatchDescriptor Trigger(Func<TriggerDescriptor, TriggerContainer> selector) =>
 			Assign(a => a.Trigger = selector.InvokeOrDefault(new TriggerDescriptor()));
 	}
diff --git a/src/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs b/src/Tests/XPack/Watcher/GetWatch/GetWatchApiTests.cs
diff --git a/src/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs b/src/Tests/XPack/Watcher/PutWatch/PutWatchApiTests.cs

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Nest`
`6`	`6`	`{`
	`7`	`+ [JsonConverter(typeof(EmailAttachmentsJsonConverter))]`
`7`	`8`	`public interface IEmailAttachments : IIsADictionary<string, IEmailAttachment> {}`
`8`	`9`
`9`		`- [JsonConverter(typeof(EmailAttachmentsJsonConverter))]`
`10`	`10`	`public class EmailAttachments : IsADictionaryBase<string, IEmailAttachment>, IEmailAttachments`
`11`	`11`	`{`
`12`	`12`	`public EmailAttachments() {}`
`@@ -34,7 +34,7 @@ internal class EmailAttachmentsJsonConverter : JsonConverter`
`34`	`34`	`public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)`
`35`	`35`	`{`
`36`	`36`	`writer.WriteStartObject();`
`37`		`- var attachments = value as IDictionary<string, IEmailAttachment>;`
	`37`	`+ var attachments = (IDictionary<string, IEmailAttachment>)value;`
`38`	`38`	`if (attachments != null)`
`39`	`39`	`{`
`40`	`40`	`foreach (var attachment in attachments)`
`@@ -67,9 +67,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`67`	`67`	`{`
`68`	`68`	`var name = (string)reader.Value;`
`69`	`69`	`IEmailAttachment attachment;`
	`70`	`+`
	`71`	`+ reader.Read();`
	`72`	`+ reader.Read();`
	`73`	`+ var type = (string)reader.Value;`
`70`	`74`	`reader.Read();`
`71`	`75`
`72`		`- var type = reader.ReadAsString();`
`73`	`76`	`switch (type)`
`74`	`77`	`{`
`75`	`78`	`case "http":`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public interface IHttpAttachment : IEmailAttachment`
`14`	`14`	`bool? Inline { get; set; }`
`15`	`15`
`16`	`16`	`[JsonProperty("request")]`
	`17`	`+ [JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequest>))]`
`17`	`18`	`IHttpInputRequest Request { get; set; }`
`18`	`19`	`}`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`namespace Nest`
`8`	`8`	`{`
`9`	`9`	`[JsonObject]`
	`10`	`+ [ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<PagerDutyAction>))]`
`10`	`11`	`public interface IPagerDutyAction : IAction, IPagerDutyEvent { }`
`11`	`12`
`12`	`13`	`public class PagerDutyAction : ActionBase, IPagerDutyAction`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace Nest`
`5`	`5`	`{`
`6`	`6`	`[JsonObject]`
`7`		`- [JsonConverter(typeof(ReadAsTypeJsonConverter<PagerDutyEvent>))]`
	`7`	`+ [ContractJsonConverter(typeof(ReadAsTypeJsonConverter<PagerDutyEvent>))]`
`8`	`8`	`public interface IPagerDutyEvent`
`9`	`9`	`{`
`10`	`10`	`[JsonProperty("account")]`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`namespace Nest`
`6`	`6`	`{`
`7`	`7`	`[JsonObject]`
	`8`	`+ [ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<WebhookAction>))]`
`8`	`9`	`public interface IWebhookAction : IAction, IHttpInputRequest`
`9`	`10`	`{`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`namespace Nest`
`4`	`4`	`{`
`5`	`5`	`[JsonObject]`
`6`		`- [JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequestResult>))]`
	`6`	`+ [ExactContractJsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputRequestResult>))]`
`7`	`7`	`public class HttpInputRequestResult : HttpInputRequest {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`94`	`94`	`{`
`95`	`95`	`if (reader.TokenType == JsonToken.StartObject)`
`96`	`96`	`{`
`97`		`- var name = reader.ReadAsString();`
	`97`	`+ reader.Read();`
	`98`	`+ var name = (string)reader.Value;`
	`99`	`+ reader.Read();`
`98`	`100`	`var input = (InputContainer)serializer.Deserialize<IInputContainer>(reader);`
`99`	`101`
`100`	`102`	`inputs.Add(name, input);`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace Nest`
`7`	`7`	`/// The Authentication mechanism for a request to a HTTP endpoint`
`8`	`8`	`/// </summary>`
`9`	`9`	`[JsonObject]`
	`10`	`+ [JsonConverter(typeof(ReadAsTypeJsonConverter<HttpInputAuthentication>))]`
`10`	`11`	`public interface IHttpInputAuthentication`
`11`	`12`	`{`
`12`	`13`	`/// <summary>`