Convert to property expressions

russcam · russcam · commit 089732496d08 · 2017-06-29T13:16:00.000+10:00
diff --git a/src/Nest/QueryDsl/FullText/Match/MatchQuery.cs b/src/Nest/QueryDsl/FullText/Match/MatchQuery.cs
@@ -66,8 +66,8 @@ public class MatchQuery : FieldNameQueryBase, IMatchQuery
 		[Obsolete("Use FuzzyMultiTermQueryRewrite")]
 		public RewriteMultiTerm? FuzzyRewrite
 		{
-			get { return FuzzyMultiTermQueryRewrite?.Rewrite; }
-			set { FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => FuzzyMultiTermQueryRewrite?.Rewrite;
+			set => FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 		public MultiTermQueryRewrite FuzzyMultiTermQueryRewrite { get; set; }
 		public IFuzziness Fuzziness { get; set; }
@@ -99,8 +99,8 @@ public class MatchQueryDescriptor<T>
 		MinimumShouldMatch IMatchQuery.MinimumShouldMatch { get; set; }
 		RewriteMultiTerm? IMatchQuery.FuzzyRewrite
 		{
-			get { return Self.FuzzyMultiTermQueryRewrite?.Rewrite; }
-			set { Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => Self.FuzzyMultiTermQueryRewrite?.Rewrite;
+			set => Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 		MultiTermQueryRewrite IMatchQuery.FuzzyMultiTermQueryRewrite { get; set; }
 		IFuzziness IMatchQuery.Fuzziness { get; set; }
diff --git a/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs b/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs
@@ -77,8 +77,8 @@ public class MultiMatchQuery : QueryBase, IMultiMatchQuery
 		[Obsolete("Use FuzzyMultiTermQueryRewrite")]
 		public RewriteMultiTerm? FuzzyRewrite
 		{
-			get { return FuzzyMultiTermQueryRewrite?.Rewrite; }
-			set { FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => FuzzyMultiTermQueryRewrite?.Rewrite;
+			set => FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 		public MultiTermQueryRewrite FuzzyMultiTermQueryRewrite { get; set; }
 
@@ -119,8 +119,8 @@ public class MultiMatchQueryDescriptor<T>
 		[Obsolete("Use FuzzyMultiTermQueryRewrite")]
 		RewriteMultiTerm? IMultiMatchQuery.FuzzyRewrite
 		{
-			get { return Self.FuzzyMultiTermQueryRewrite?.Rewrite; }
-			set { Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => Self.FuzzyMultiTermQueryRewrite?.Rewrite;
+			set => Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 		MultiTermQueryRewrite IMultiMatchQuery.FuzzyMultiTermQueryRewrite { get; set; }
 		Fuzziness IMultiMatchQuery.Fuzziness { get; set; }
diff --git a/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryBase.cs b/src/Nest/QueryDsl/TermLevel/Fuzzy/FuzzyQueryBase.cs
@@ -49,8 +49,8 @@ public abstract class FuzzyQueryBase<TValue, TFuzziness> : FieldNameQueryBase, I
 		[Obsolete("Use MultiTermQueryRewrite")]
 		public RewriteMultiTerm? Rewrite
 		{
-			get { return MultiTermQueryRewrite?.Rewrite; }
-			set { MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => MultiTermQueryRewrite?.Rewrite;
+			set => MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 
 		public MultiTermQueryRewrite MultiTermQueryRewrite { get; set; }
@@ -78,8 +78,8 @@ public abstract class FuzzyQueryDescriptorBase<TDescriptor, T, TValue, TFuzzines
 		[Obsolete("Use MultiTermQueryRewrite")]
 		RewriteMultiTerm? IFuzzyQuery.Rewrite
 		{
-			get { return Self.MultiTermQueryRewrite?.Rewrite; }
-			set { Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => Self.MultiTermQueryRewrite?.Rewrite;
+			set => Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 
 		MultiTermQueryRewrite IFuzzyQuery.MultiTermQueryRewrite { get; set; }
diff --git a/src/Nest/QueryDsl/TermLevel/Prefix/PrefixQuery.cs b/src/Nest/QueryDsl/TermLevel/Prefix/PrefixQuery.cs
@@ -24,8 +24,8 @@ public class PrefixQuery : FieldNameQueryBase, IPrefixQuery
 		[Obsolete("Use MultiTermQueryRewrite")]
 		public RewriteMultiTerm? Rewrite
 		{
-			get { return MultiTermQueryRewrite?.Rewrite; }
-			set { MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => MultiTermQueryRewrite?.Rewrite;
+			set => MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 
 		public MultiTermQueryRewrite MultiTermQueryRewrite { get; set; }
@@ -40,8 +40,8 @@ public class PrefixQueryDescriptor<T> : TermQueryDescriptorBase<PrefixQueryDescr
 
 		RewriteMultiTerm? IPrefixQuery.Rewrite
 		{
-			get { return Self.MultiTermQueryRewrite?.Rewrite; }
-			set { Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => Self.MultiTermQueryRewrite?.Rewrite;
+			set => Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 
 		MultiTermQueryRewrite IPrefixQuery.MultiTermQueryRewrite { get; set; }
diff --git a/src/Nest/QueryDsl/TermLevel/Wildcard/WildcardQuery.cs b/src/Nest/QueryDsl/TermLevel/Wildcard/WildcardQuery.cs
@@ -31,8 +31,8 @@ public class WildcardQuery : FieldNameQueryBase, IWildcardQuery
 		[Obsolete("Use MultiTermQueryRewrite")]
 		public RewriteMultiTerm? Rewrite
 		{
-			get { return MultiTermQueryRewrite?.Rewrite; }
-			set { MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => MultiTermQueryRewrite?.Rewrite;
+			set => MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 
 		public MultiTermQueryRewrite MultiTermQueryRewrite { get; set; }
@@ -48,8 +48,8 @@ public class WildcardQueryDescriptor<T> : TermQueryDescriptorBase<WildcardQueryD
 
 		RewriteMultiTerm? IWildcardQuery.Rewrite
 		{
-			get { return Self.MultiTermQueryRewrite?.Rewrite; }
-			set { Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }
+			get => Self.MultiTermQueryRewrite?.Rewrite;
+			set => Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);
 		}
 
 		MultiTermQueryRewrite IWildcardQuery.MultiTermQueryRewrite { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ public class MatchQuery : FieldNameQueryBase, IMatchQuery`
`66`	`66`	`[Obsolete("Use FuzzyMultiTermQueryRewrite")]`
`67`	`67`	`public RewriteMultiTerm? FuzzyRewrite`
`68`	`68`	`{`
`69`		`- get { return FuzzyMultiTermQueryRewrite?.Rewrite; }`
`70`		`- set { FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`69`	`+ get => FuzzyMultiTermQueryRewrite?.Rewrite;`
	`70`	`+ set => FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`71`	`71`	`}`
`72`	`72`	`public MultiTermQueryRewrite FuzzyMultiTermQueryRewrite { get; set; }`
`73`	`73`	`public IFuzziness Fuzziness { get; set; }`
`@@ -99,8 +99,8 @@ public class MatchQueryDescriptor<T>`
`99`	`99`	`MinimumShouldMatch IMatchQuery.MinimumShouldMatch { get; set; }`
`100`	`100`	`RewriteMultiTerm? IMatchQuery.FuzzyRewrite`
`101`	`101`	`{`
`102`		`- get { return Self.FuzzyMultiTermQueryRewrite?.Rewrite; }`
`103`		`- set { Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`102`	`+ get => Self.FuzzyMultiTermQueryRewrite?.Rewrite;`
	`103`	`+ set => Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`104`	`104`	`}`
`105`	`105`	`MultiTermQueryRewrite IMatchQuery.FuzzyMultiTermQueryRewrite { get; set; }`
`106`	`106`	`IFuzziness IMatchQuery.Fuzziness { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ public class MultiMatchQuery : QueryBase, IMultiMatchQuery`
`77`	`77`	`[Obsolete("Use FuzzyMultiTermQueryRewrite")]`
`78`	`78`	`public RewriteMultiTerm? FuzzyRewrite`
`79`	`79`	`{`
`80`		`- get { return FuzzyMultiTermQueryRewrite?.Rewrite; }`
`81`		`- set { FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`80`	`+ get => FuzzyMultiTermQueryRewrite?.Rewrite;`
	`81`	`+ set => FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`82`	`82`	`}`
`83`	`83`	`public MultiTermQueryRewrite FuzzyMultiTermQueryRewrite { get; set; }`
`84`	`84`
`@@ -119,8 +119,8 @@ public class MultiMatchQueryDescriptor<T>`
`119`	`119`	`[Obsolete("Use FuzzyMultiTermQueryRewrite")]`
`120`	`120`	`RewriteMultiTerm? IMultiMatchQuery.FuzzyRewrite`
`121`	`121`	`{`
`122`		`- get { return Self.FuzzyMultiTermQueryRewrite?.Rewrite; }`
`123`		`- set { Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`122`	`+ get => Self.FuzzyMultiTermQueryRewrite?.Rewrite;`
	`123`	`+ set => Self.FuzzyMultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`124`	`124`	`}`
`125`	`125`	`MultiTermQueryRewrite IMultiMatchQuery.FuzzyMultiTermQueryRewrite { get; set; }`
`126`	`126`	`Fuzziness IMultiMatchQuery.Fuzziness { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ public abstract class FuzzyQueryBase<TValue, TFuzziness> : FieldNameQueryBase, I`
`49`	`49`	`[Obsolete("Use MultiTermQueryRewrite")]`
`50`	`50`	`public RewriteMultiTerm? Rewrite`
`51`	`51`	`{`
`52`		`- get { return MultiTermQueryRewrite?.Rewrite; }`
`53`		`- set { MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`52`	`+ get => MultiTermQueryRewrite?.Rewrite;`
	`53`	`+ set => MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public MultiTermQueryRewrite MultiTermQueryRewrite { get; set; }`
`@@ -78,8 +78,8 @@ public abstract class FuzzyQueryDescriptorBase<TDescriptor, T, TValue, TFuzzines`
`78`	`78`	`[Obsolete("Use MultiTermQueryRewrite")]`
`79`	`79`	`RewriteMultiTerm? IFuzzyQuery.Rewrite`
`80`	`80`	`{`
`81`		`- get { return Self.MultiTermQueryRewrite?.Rewrite; }`
`82`		`- set { Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`81`	`+ get => Self.MultiTermQueryRewrite?.Rewrite;`
	`82`	`+ set => Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`MultiTermQueryRewrite IFuzzyQuery.MultiTermQueryRewrite { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ public class PrefixQuery : FieldNameQueryBase, IPrefixQuery`
`24`	`24`	`[Obsolete("Use MultiTermQueryRewrite")]`
`25`	`25`	`public RewriteMultiTerm? Rewrite`
`26`	`26`	`{`
`27`		`- get { return MultiTermQueryRewrite?.Rewrite; }`
`28`		`- set { MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`27`	`+ get => MultiTermQueryRewrite?.Rewrite;`
	`28`	`+ set => MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public MultiTermQueryRewrite MultiTermQueryRewrite { get; set; }`
`@@ -40,8 +40,8 @@ public class PrefixQueryDescriptor<T> : TermQueryDescriptorBase<PrefixQueryDescr`
`40`	`40`
`41`	`41`	`RewriteMultiTerm? IPrefixQuery.Rewrite`
`42`	`42`	`{`
`43`		`- get { return Self.MultiTermQueryRewrite?.Rewrite; }`
`44`		`- set { Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`43`	`+ get => Self.MultiTermQueryRewrite?.Rewrite;`
	`44`	`+ set => Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`MultiTermQueryRewrite IPrefixQuery.MultiTermQueryRewrite { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public class WildcardQuery : FieldNameQueryBase, IWildcardQuery`
`31`	`31`	`[Obsolete("Use MultiTermQueryRewrite")]`
`32`	`32`	`public RewriteMultiTerm? Rewrite`
`33`	`33`	`{`
`34`		`- get { return MultiTermQueryRewrite?.Rewrite; }`
`35`		`- set { MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`34`	`+ get => MultiTermQueryRewrite?.Rewrite;`
	`35`	`+ set => MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public MultiTermQueryRewrite MultiTermQueryRewrite { get; set; }`
`@@ -48,8 +48,8 @@ public class WildcardQueryDescriptor<T> : TermQueryDescriptorBase<WildcardQueryD`
`48`	`48`
`49`	`49`	`RewriteMultiTerm? IWildcardQuery.Rewrite`
`50`	`50`	`{`
`51`		`- get { return Self.MultiTermQueryRewrite?.Rewrite; }`
`52`		`- set { Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value); }`
	`51`	`+ get => Self.MultiTermQueryRewrite?.Rewrite;`
	`52`	`+ set => Self.MultiTermQueryRewrite = value == null ? null : new MultiTermQueryRewrite(value.Value);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`MultiTermQueryRewrite IWildcardQuery.MultiTermQueryRewrite { get; set; }`