SPR-5923 - HttpMessageConverter selection as a result of @ResponseBody should consider the requested content type

org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeException.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web;
+
+import java.util.List;
+import java.util.Collections;
+import javax.servlet.ServletException;
+
+import org.springframework.http.MediaType;
+
+/**
+ * Abstract base for exceptions related to media types. Adds a list of supported {@link MediaType MediaTypes}.
+ *
+ * @author Arjen Poutsma
+ * @since 3.0
+ */
+public abstract class HttpMediaTypeException extends ServletException {
+
+	private final List<MediaType> supportedMediaTypes;
+
+	/**
+	 * Create a new MediaTypeException.
+	 * @param message the exception message
+	 */
+	protected HttpMediaTypeException(String message) {
+		super(message);
+		this.supportedMediaTypes = Collections.emptyList();
+	}
+
+	/**
+	 * Create a new HttpMediaTypeNotSupportedException.
+	 * @param supportedMediaTypes the list of supported media types
+	 */
+	protected HttpMediaTypeException(String message, List<MediaType> supportedMediaTypes) {
+		super(message);
+		this.supportedMediaTypes = supportedMediaTypes;
+	}
+
+	/**
+	 * Return the list of supported media types.
+	 */
+	public List<MediaType> getSupportedMediaTypes() {
+		return supportedMediaTypes;
+	}
+}

org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web;
+
+import java.util.List;
+
+import org.springframework.http.MediaType;
+
+/**
+ * Exception thrown when the request handler cannot generate a response that is acceptable by the client.
+ *
+ * @author Arjen Poutsma
+ * @since 3.0
+ */
+public class HttpMediaTypeNotAcceptableException extends HttpMediaTypeException {
+
+	/**
+	 * Create a new HttpMediaTypeNotAcceptableException.
+	 * @param message the exception message
+	 */
+	public HttpMediaTypeNotAcceptableException(String message) {
+		super(message);
+	}
+
+	/**
+	 * Create a new HttpMediaTypeNotSupportedException.
+	 * @param supportedMediaTypes the list of supported media types
+	 */
+	public HttpMediaTypeNotAcceptableException(List<MediaType> supportedMediaTypes) {
+		super("Could not find acceptable representation", supportedMediaTypes);
+	}
+
+}

org.springframework.web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java

@@ -16,9 +16,7 @@
 
 package org.springframework.web;
 
-import java.util.Collections;
 import java.util.List;
-import javax.servlet.ServletException;
 
 import org.springframework.http.MediaType;
 
@@ -29,12 +27,10 @@ import org.springframework.http.MediaType;
  * @author Arjen Poutsma
  * @since 3.0
  */
-public class HttpMediaTypeNotSupportedException extends ServletException {
+public class HttpMediaTypeNotSupportedException extends HttpMediaTypeException {
 
 	private final MediaType contentType;
 
-	private final List<MediaType> supportedMediaTypes;
-
 	/**
 	 * Create a new HttpMediaTypeNotSupportedException.
 	 * @param message the exception message
@@ -42,7 +38,6 @@ public class HttpMediaTypeNotSupportedException extends ServletException {
 	public HttpMediaTypeNotSupportedException(String message) {
 		super(message);
 		this.contentType = null;
-		this.supportedMediaTypes = Collections.emptyList();
 	}
 
 	/**
@@ -61,9 +56,8 @@ public class HttpMediaTypeNotSupportedException extends ServletException {
 	 * @param msg the detail message
 	 */
 	public HttpMediaTypeNotSupportedException(MediaType contentType, List<MediaType> supportedMediaTypes, String msg) {
-		super(msg);
+		super(msg, supportedMediaTypes);
 		this.contentType = contentType;
-		this.supportedMediaTypes = supportedMediaTypes;
 	}
 
 	/**
@@ -73,10 +67,4 @@ public class HttpMediaTypeNotSupportedException extends ServletException {
 		return contentType;
 	}
 
-	/**
-	 * Return the list of supported media types.
-	 */
-	public List<MediaType> getSupportedMediaTypes() {
-		return supportedMediaTypes;
-	}
 }