Removed [RouteAttribute].DefaultContentType as the functionality is not implemented internally

Author: steff-mueller

src/ServiceStack.Interfaces/ServiceHost/IRestPath.cs

@@ -7,8 +7,6 @@ public interface IRestPath
 	{
 		Type RequestType { get; }
 
-		string DefaultContentType { get; }
-
 		object CreateRequest(string pathInfo, Dictionary<string, string> queryStringAndFormData, object fromInstance);
 	}
 }

src/ServiceStack.Interfaces/ServiceHost/IServiceRoutes.cs

@@ -35,30 +35,6 @@ public interface IServiceRoutes
 		///		never <see langword="null"/>.</returns>
 		IServiceRoutes Add<TRequest>(string restPath, string verbs);
 
-		/// <summary>
-		///		Maps the specified REST path to the specified request DTO, 
-		///		specifies the HTTP verbs supported by the path, and indicates
-		///		the default MIME type of the returned response.
-		/// </summary>
-		/// <typeparam name="TRequest">The type of request DTO to map 
-		///		the path to.</typeparam>
-		/// <param name="restPath">The path to map the request DTO to.
-		///		See <see cref="RestServiceAttribute.Path">RestServiceAttribute.Path</see>
-		///		for details on the correct format.</param>
-		/// <param name="verbs">
-		///		The comma-delimited list of HTTP verbs supported by the path, 
-		///		such as "GET,PUT,DELETE".
-		/// </param>
-		/// <param name="defaultContentType">
-		///		The default MIME type in which the response object returned to the client
-		///		is formatted, if formatting hints are not provided by the client.
-		///		Specify <see langword="null"/> or empty to require formatting hints from
-		///		the client.
-		/// </param>
-		/// <returns>The same <see cref="IServiceRoutes"/> instance;
-		///		never <see langword="null"/>.</returns>
-		IServiceRoutes Add<TRequest>(string restPath, string verbs, string defaultContentType);
-
 		/// <summary>
 		///		Maps the specified REST path to the specified request DTO, 
 		///		specifies the HTTP verbs supported by the path, and indicates
@@ -74,14 +50,8 @@ public interface IServiceRoutes
 		///		The comma-delimited list of HTTP verbs supported by the path, 
 		///		such as "GET,PUT,DELETE".
 		/// </param>
-		/// <param name="defaultContentType">
-		///		The default MIME type in which the response object returned to the client
-		///		is formatted, if formatting hints are not provided by the client.
-		///		Specify <see langword="null"/> or empty to require formatting hints from
-		///		the client.
-		/// </param>
 		/// <returns>The same <see cref="IServiceRoutes"/> instance;
 		///		never <see langword="null"/>.</returns>
-		IServiceRoutes Add(System.Type requestType, string restPath, string verbs, string defaultContentType);
+		IServiceRoutes Add(System.Type requestType, string restPath, string verbs);
 	}
 }

src/ServiceStack.Interfaces/ServiceHost/RestServiceAttribute.cs

@@ -8,56 +8,36 @@ namespace ServiceStack.ServiceHost
 	///		each request DTO, to map multiple paths to the service.
 	/// </summary>
     [Obsolete("Use [Route] instead of [RestService].")]
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-	public class RestServiceAttribute
-		: RouteAttribute
-	{
-		/// <summary>
-		/// 	<para>Initializes an instance of the <see cref="RestServiceAttribute"/> class.</para>
-		/// </summary>
-		/// <param name="path">
-		/// 	<para>The path template to map to the request.  See 
-		///		<see cref="Path">RestServiceAttribute.Path</see>
-		///		for details on the correct format.</para>
-		/// </param>
-		public RestServiceAttribute(string path)
-			: base(path, null, null)
-		{
-		}
-
-		/// <summary>
-		/// 	<para>Initializes an instance of the <see cref="RestServiceAttribute"/> class.</para>
-		/// </summary>
-		/// <param name="path">
-		/// 	<para>The path template to map to the request.  See 
-		///		<see cref="Path">RestServiceAttribute.Path</see>
-		///		for details on the correct format.</para>
-		/// </param>
-		/// <param name="verbs">A comma-delimited list of HTTP verbs supported by the 
-		///		service.  If unspecified, all verbs are assumed to be supported.</param>
-		public RestServiceAttribute(string path, string verbs)
-			: base(path, verbs, null)
-		{
-		}
-
-		/// <summary>
-		/// 	<para>Initializes an instance of the <see cref="RestServiceAttribute"/> class.</para>
-		/// </summary>
-		/// <param name="path">
-		/// 	<para>The path template to map to the request.  See 
-		///		<see cref="Path">RestServiceAttribute.Path</see>
-		///		for details on the correct format.</para>
-		/// </param>
-		/// <param name="verbs">A comma-delimited list of HTTP verbs supported by the 
-		///		service.  If unspecified, all verbs are assumed to be supported.</param>
-		/// <param name="defaultContentType">The default MIME type in which the response
-		///		object returned to the client is formatted, if formatting hints are unspecified
-		///		in the URL. Specify <see langword="null"/> or empty to require formatting
-		///		hints from the client.</param>
-		public RestServiceAttribute(string path, string verbs, string defaultContentType)
-            : base(path, verbs, defaultContentType)
-		{
-		}
-	}
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public class RestServiceAttribute
+        : RouteAttribute
+    {
+        /// <summary>
+        /// 	<para>Initializes an instance of the <see cref="RestServiceAttribute"/> class.</para>
+        /// </summary>
+        /// <param name="path">
+        /// 	<para>The path template to map to the request.  See 
+        ///		<see cref="Path">RestServiceAttribute.Path</see>
+        ///		for details on the correct format.</para>
+        /// </param>
+        public RestServiceAttribute(string path)
+            : base(path, null)
+        {
+        }
 
+        /// <summary>
+        /// 	<para>Initializes an instance of the <see cref="RestServiceAttribute"/> class.</para>
+        /// </summary>
+        /// <param name="path">
+        /// 	<para>The path template to map to the request.  See 
+        ///		<see cref="Path">RestServiceAttribute.Path</see>
+        ///		for details on the correct format.</para>
+        /// </param>
+        /// <param name="verbs">A comma-delimited list of HTTP verbs supported by the 
+        ///		service.  If unspecified, all verbs are assumed to be supported.</param>
+        public RestServiceAttribute(string path, string verbs)
+            : base(path, verbs)
+        {
+        }
+    }
 }

src/ServiceStack.Interfaces/ServiceHost/RouteAttribute.cs

@@ -22,7 +22,7 @@ public class RouteAttribute : Attribute
 		///		for details on the correct format.</para>
 		/// </param>
 		public RouteAttribute(string path)
-			: this(path, null, null)
+			: this(path, null)
 		{
 		}
 
@@ -37,29 +37,9 @@ public RouteAttribute(string path)
 		/// <param name="verbs">A comma-delimited list of HTTP verbs supported by the 
 		///		service.  If unspecified, all verbs are assumed to be supported.</param>
 		public RouteAttribute(string path, string verbs)
-			: this(path, verbs, null)
 		{
-		}
-
-		/// <summary>
-		/// 	<para>Initializes an instance of the <see cref="RouteAttribute"/> class.</para>
-		/// </summary>
-		/// <param name="path">
-		/// 	<para>The path template to map to the request.  See 
-		///		<see cref="Path">RouteAttribute.Path</see>
-		///		for details on the correct format.</para>
-		/// </param>
-		/// <param name="verbs">A comma-delimited list of HTTP verbs supported by the 
-		///		service.  If unspecified, all verbs are assumed to be supported.</param>
-		/// <param name="defaultContentType">The default MIME type in which the response
-		///		object returned to the client is formatted, if formatting hints are unspecified
-		///		in the URL. Specify <see langword="null"/> or empty to require formatting
-		///		hints from the client.</param>
-		public RouteAttribute(string path, string verbs, string defaultContentType)
-		{
-			Path = path;
-			Verbs = verbs;
-			DefaultContentType = defaultContentType;
+            Path = path;
+            Verbs = verbs;
 		}
 
 		/// <summary>
@@ -120,18 +100,5 @@ public RouteAttribute(string path, string verbs, string defaultContentType)
 		///		by the service, <see langword="null"/> or empty if all verbs are supported.
 		/// </value>
 		public string Verbs { get; set; }
-
-		/// <summary>
-		///		Gets or sets the default MIME type in which the response 
-		///		object returned to the client is formatted, when format hints 
-		///		are not provided in the URI.  Some valid examples are such as 
-		///		"application/json", or "application/xml".
-		/// </summary>
-		/// <value>
-		///		A <see cref="String"/> providing the default MIME type of the response;
-		///		<see langword="null"/> or empty if formatting hints are required 
-		///		from the client.
-		/// </value>
-		public string DefaultContentType { get; set; }
     }
 }

src/ServiceStack.ServiceInterface/ServiceRoutesExtensions.cs

@@ -81,13 +81,13 @@ from t in assembly.GetExportedTypes()
                         allowedVerbs = string.Join(" ", allowedMethods.ToArray());
                     }
 
-                    routes.Add(requestType, requestType.Name, allowedVerbs, null);
+                    routes.Add(requestType, requestType.Name, allowedVerbs);
 
                     var hasIdField = requestType.GetProperty(IdUtils.IdField) != null;
                     if (hasIdField)
                     {
                         var routePath = requestType.Name + "/{" + IdUtils.IdField + "}";
-                        routes.Add(requestType, routePath, allowedVerbs, null);
+                        routes.Add(requestType, routePath, allowedVerbs);
                     }
                 }
             }
@@ -100,14 +100,9 @@ public static IServiceRoutes Add<TRequest>(this IServiceRoutes routes, string re
             return routes.Add<TRequest>(restPath, verbs.ToVerbsString());
         }
 
-        public static IServiceRoutes Add<TRequest>(this IServiceRoutes routes, string restPath, ApplyTo verbs, string defaultContentType)
+        public static IServiceRoutes Add(this IServiceRoutes routes, Type requestType, string restPath, ApplyTo verbs)
         {
-            return routes.Add<TRequest>(restPath, verbs.ToVerbsString(), defaultContentType);
-        }
-
-        public static IServiceRoutes Add(this IServiceRoutes routes, Type requestType, string restPath, ApplyTo verbs, string defaultContentType)
-        {
-            return routes.Add(requestType, restPath, verbs.ToVerbsString(), defaultContentType);
+            return routes.Add(requestType, restPath, verbs.ToVerbsString());
         }
 
         private static string ToVerbsString(this ApplyTo verbs)

src/ServiceStack/ServiceHost/RestPath.cs

@@ -20,7 +20,6 @@ public class RestPath
 
 		readonly bool[] componentsWithSeparators = new bool[0];
 
-		public string DefaultContentType { get; private set; }
 		private readonly string restPath;
 		private readonly string allowedVerbs;
 		private readonly bool allowsAllVerbs;
@@ -86,14 +85,13 @@ private static IEnumerable<string> GetPotentialMatchesWithPrefix(string hashPref
 			}
 		}
 
-		public RestPath(Type requestType, string path) : this(requestType, path, null, null) { }
+		public RestPath(Type requestType, string path) : this(requestType, path, null) { }
 
-		public RestPath(Type requestType, string path, string verbs, string defaultContentType)
+		public RestPath(Type requestType, string path, string verbs)
 		{
 			this.RequestType = requestType;
 
 			this.restPath = path;
-			this.DefaultContentType = defaultContentType;
 			this.allowsAllVerbs = verbs == null || verbs == WildCard;
 			if (!this.allowsAllVerbs)
 			{

src/ServiceStack/ServiceHost/ServiceController.cs

@@ -136,7 +136,7 @@ public void RegisterRestPaths(Type requestType)
 			var attrs = requestType.GetCustomAttributes(typeof(RouteAttribute), true);
 			foreach (RouteAttribute attr in attrs)
 			{
-				var restPath = new RestPath(requestType, attr.Path, attr.Verbs, attr.DefaultContentType);
+				var restPath = new RestPath(requestType, attr.Path, attr.Verbs);
 				if (!restPath.IsValid)
 					throw new NotSupportedException(string.Format(
 						"RestPath '{0}' on Type '{1}' is not Valid", attr.Path, requestType.Name));

src/ServiceStack/ServiceHost/ServiceRoutes.cs

@@ -15,19 +15,13 @@ public IServiceRoutes Add<TRequest>(string restPath)
 
 		public IServiceRoutes Add<TRequest>(string restPath, string verbs)
 		{
-			RestPaths.Add(new RestPath(typeof(TRequest), restPath, verbs, null));
+			RestPaths.Add(new RestPath(typeof(TRequest), restPath, verbs));
 			return this;
 		}
 
-		public IServiceRoutes Add<TRequest>(string restPath, string verbs, string defaultContentType)
-		{
-			RestPaths.Add(new RestPath(typeof(TRequest), restPath, verbs, defaultContentType));
-			return this;
-		}
-
-        public IServiceRoutes Add(Type requestType, string restPath, string verbs, string defaultContentType)
+        public IServiceRoutes Add(Type requestType, string restPath, string verbs)
         {
-            RestPaths.Add(new RestPath(requestType, restPath, verbs, defaultContentType));
+            RestPaths.Add(new RestPath(requestType, restPath, verbs));
             return this;
         }
 	}

src/ServiceStack/WebHost.Endpoints/AppHostBase.cs

@@ -234,7 +234,7 @@ public void RegisterService(Type serviceType, params string[] atRestPaths)
 			var requestType = genericService.GetGenericArguments()[0];
 			foreach (var atRestPath in atRestPaths)
 			{
-				this.Routes.Add(requestType, atRestPath, null, null);
+				this.Routes.Add(requestType, atRestPath, null);
 			}
 		}
 

src/ServiceStack/WebHost.Endpoints/Support/HttpListenerBase.cs

@@ -413,7 +413,7 @@ public void RegisterService(Type serviceType, params string[] atRestPaths)
 			var requestType = genericService.GetGenericArguments()[0];
 			foreach (var atRestPath in atRestPaths)
 			{
-				this.Routes.Add(requestType, atRestPath, null, null);
+				this.Routes.Add(requestType, atRestPath, null);
 			}
 		}