TypeFilter did not mark itself conditionless properly

Author: Mpdreamz

src/Nest.Tests.Unit/Core/Get/GetFullTests.cs

@@ -41,16 +41,7 @@ public void GetUsingDescriptor()
 			var status = result.ConnectionStatus;
 			StringAssert.EndsWith("/myindex/elasticsearchprojects/404", status.RequestUrl);
 		}
-		[Test]
-		public void GetUsingDescriptorEscapes()
-		{
-			var result = this._client.GetFull<ElasticSearchProject>(g => g
-				.Index("myindex")
-				.Id("myid/with/slashes")
-			);
-			var status = result.ConnectionStatus;
-			StringAssert.EndsWith("/myindex/elasticsearchprojects/myid%252Fwith%252Fslashes", status.RequestUrl);
-		}
+	
 		[Test]
 		public void GetUsingDescriptorWithType()
 		{

src/Nest.Tests.Unit/Core/Index/IndexTests.cs

@@ -28,6 +28,7 @@ public void IndexParameters()
 			var status = result.ConnectionStatus;
 			StringAssert.Contains("version=1", status.RequestUrl);
 		}
+	
 		[Test]
 		public void GetSupportsVersioning()
 		{

src/Nest/DSL/Filter/TypeFilter.cs

@@ -13,7 +13,7 @@ internal override bool IsConditionless
 		{
 			get
 			{
-				return this.Value.IsNullOrEmpty();
+				return this.Value.IsConditionless();
 			}
 
 		}

src/Nest/Domain/Connection/Connection.cs

@@ -3,6 +3,7 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -326,17 +327,21 @@ public void Iterate(IEnumerable<Task> asyncIterator, TaskCompletionSource<Connec
 			recursiveBody(null);
 		}
 
-		private string _CreateUriString(string path)
+		private Uri _CreateUriString(string path)
 		{
             var s = this._ConnectionSettings;
-
+			
+				
 			if (s.QueryStringParameters != null)
 			{
-				var uri = new Uri(s.Uri, path);
-				var qs = s.QueryStringParameters.ToQueryString(uri.Query.IsNullOrEmpty() ? "?" : "&");
+				var tempUri = new Uri(s.Uri, path);
+				var qs = s.QueryStringParameters.ToQueryString(tempUri.Query.IsNullOrEmpty() ? "?" : "&");
 				path += qs;
 			}
-
+			LeaveDotsAndSlashesEscaped(s.Uri);
+			var uri = new Uri(s.Uri, path);
+			LeaveDotsAndSlashesEscaped(uri);
+			return uri;
 			var url = s.Uri.AbsoluteUri + path;
 			//WebRequest.Create will replace %2F with / 
 			//this is a 'security feature'
@@ -346,7 +351,39 @@ private string _CreateUriString(string path)
 			//it won't barf.
 			//If you manually set the config settings to NOT forefully unescape dots and slashes be sure to call 
 			//.SetDontDoubleEscapePathDotsAndSlashes() on the connection settings.
-			return this._ConnectionSettings.DontDoubleEscapePathDotsAndSlashes ? url : url.Replace("%2F", "%252F");
+			//return );
+
+			//return this._ConnectionSettings.DontDoubleEscapePathDotsAndSlashes ? url : url.Replace("%2F", "%252F");
+		}
+
+		// System.UriSyntaxFlags is internal, so let's duplicate the flag privately
+		private const int UnEscapeDotsAndSlashes = 0x2000000;
+
+		public static void LeaveDotsAndSlashesEscaped(Uri uri)
+		{
+			if (uri == null)
+			{
+				throw new ArgumentNullException("uri");
+			}
+
+			FieldInfo fieldInfo = uri.GetType().GetField("m_Syntax", BindingFlags.Instance | BindingFlags.NonPublic);
+			if (fieldInfo == null)
+			{
+				throw new MissingFieldException("'m_Syntax' field not found");
+			}
+			object uriParser = fieldInfo.GetValue(uri);
+
+			fieldInfo = typeof(UriParser).GetField("m_Flags", BindingFlags.Instance | BindingFlags.NonPublic);
+			if (fieldInfo == null)
+			{
+				throw new MissingFieldException("'m_Flags' field not found");
+			}
+			object uriSyntaxFlags = fieldInfo.GetValue(uriParser);
+
+			// Clear the flag that we don't want
+			uriSyntaxFlags = (int)uriSyntaxFlags & ~UnEscapeDotsAndSlashes;
+
+			fieldInfo.SetValue(uriParser, uriSyntaxFlags);
 		}
 	}
 }

src/Nest/Resolvers/TypeNameMarker.cs

@@ -10,6 +10,12 @@ public class TypeNameMarker : IEquatable<TypeNameMarker>
 		public string Name { get; set; }
 		public Type Type { get; set; }
 
+		public bool IsConditionless ()
+		{
+			return this.Name.IsNullOrEmpty() && this.Type == null;
+		}
+
+
 		public string Resolve(IConnectionSettings connectionSettings)
 		{
 			connectionSettings.ThrowIfNull("connectionSettings");
@@ -38,12 +44,12 @@ public static implicit operator TypeNameMarker(string typeName)
 		{
 			return new TypeNameMarker {Name = typeName};
 		}
+	
 		public static implicit operator TypeNameMarker(Type type)
 		{
 			return new TypeNameMarker { Type = type };
 		}
 
-
 		public override int GetHashCode()
 		{
 			if (this.Name != null)