MimeTypeUtils constants cleanup: removed web media types

Issue: SPR-15137

Author: jhoeller

spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -62,26 +62,6 @@ public abstract class MimeTypeUtils {
 	 */
 	public static final String ALL_VALUE = "*/*";
 
-	/**
-	 *  Public constant mime type for {@code application/atom+xml}.
-	 */
-	public final static MimeType APPLICATION_ATOM_XML;
-
-	/**
-	 * A String equivalent of {@link MimeTypeUtils#APPLICATION_ATOM_XML}.
-	 */
-	public final static String APPLICATION_ATOM_XML_VALUE = "application/atom+xml";
-
-	/**
-	 * Public constant mime type for {@code application/x-www-form-urlencoded}.
-	 *  */
-	public final static MimeType APPLICATION_FORM_URLENCODED;
-
-	/**
-	 * A String equivalent of {@link MimeTypeUtils#APPLICATION_FORM_URLENCODED}.
-	 */
-	public final static String APPLICATION_FORM_URLENCODED_VALUE = "application/x-www-form-urlencoded";
-
 	/**
 	 * Public constant mime type for {@code application/json}.
 	 * */
@@ -102,26 +82,6 @@ public abstract class MimeTypeUtils {
 	 */
 	public final static String APPLICATION_OCTET_STREAM_VALUE = "application/octet-stream";
 
-	/**
-	 * Public constant mime type for {@code application/rss+xml}.
-	 */
-	public final static MimeType APPLICATION_RSS_XML;
-
-	/**
-	 * A String equivalent of {@link MimeTypeUtils#APPLICATION_RSS_XML}.
-	 */
-	public final static String APPLICATION_RSS_XML_VALUE = "application/rss+xml";
-
-	/**
-	 * Public constant mime type for {@code application/xhtml+xml}.
-	 *  */
-	public final static MimeType APPLICATION_XHTML_XML;
-
-	/**
-	 * A String equivalent of {@link MimeTypeUtils#APPLICATION_XHTML_XML}.
-	 */
-	public final static String APPLICATION_XHTML_XML_VALUE = "application/xhtml+xml";
-
 	/**
 	 * Public constant mime type for {@code application/xml}.
 	 */
@@ -162,16 +122,6 @@ public abstract class MimeTypeUtils {
 	 */
 	public final static String IMAGE_PNG_VALUE = "image/png";
 
-	/**
-	 * Public constant mime type for {@code multipart/form-data}.
-	 *  */
-	public final static MimeType MULTIPART_FORM_DATA;
-
-	/**
-	 * A String equivalent of {@link MimeTypeUtils#MULTIPART_FORM_DATA}.
-	 */
-	public final static String MULTIPART_FORM_DATA_VALUE = "multipart/form-data";
-
 	/**
 	 * Public constant mime type for {@code text/html}.
 	 *  */
@@ -205,17 +155,12 @@ public abstract class MimeTypeUtils {
 
 	static {
 		ALL = MimeType.valueOf(ALL_VALUE);
-		APPLICATION_ATOM_XML = MimeType.valueOf(APPLICATION_ATOM_XML_VALUE);
-		APPLICATION_FORM_URLENCODED = MimeType.valueOf(APPLICATION_FORM_URLENCODED_VALUE);
 		APPLICATION_JSON = MimeType.valueOf(APPLICATION_JSON_VALUE);
 		APPLICATION_OCTET_STREAM = MimeType.valueOf(APPLICATION_OCTET_STREAM_VALUE);
-		APPLICATION_RSS_XML = MimeType.valueOf(APPLICATION_RSS_XML_VALUE);
-		APPLICATION_XHTML_XML = MimeType.valueOf(APPLICATION_XHTML_XML_VALUE);
 		APPLICATION_XML = MimeType.valueOf(APPLICATION_XML_VALUE);
 		IMAGE_GIF = MimeType.valueOf(IMAGE_GIF_VALUE);
 		IMAGE_JPEG = MimeType.valueOf(IMAGE_JPEG_VALUE);
 		IMAGE_PNG = MimeType.valueOf(IMAGE_PNG_VALUE);
-		MULTIPART_FORM_DATA = MimeType.valueOf(MULTIPART_FORM_DATA_VALUE);
 		TEXT_HTML = MimeType.valueOf(TEXT_HTML_VALUE);
 		TEXT_PLAIN = MimeType.valueOf(TEXT_PLAIN_VALUE);
 		TEXT_XML = MimeType.valueOf(TEXT_XML_VALUE);

spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -33,6 +33,7 @@
 import org.springframework.messaging.support.MessageHeaderAccessor;
 import org.springframework.util.AlternativeJdkIdGenerator;
 import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.MultiValueMap;
 
@@ -159,7 +160,7 @@ public void toNativeHeadersMessageFrame() {
 	@Test
 	public void toNativeHeadersContentType() {
 		SimpMessageHeaderAccessor simpHeaderAccessor = SimpMessageHeaderAccessor.create();
-		simpHeaderAccessor.setContentType(MimeTypeUtils.APPLICATION_ATOM_XML);
+		simpHeaderAccessor.setContentType(MimeType.valueOf("application/atom+xml"));
 		Message<byte[]> message = MessageBuilder.createMessage(new byte[0], simpHeaderAccessor.getMessageHeaders());
 
 		StompHeaderAccessor stompHeaderAccessor = StompHeaderAccessor.wrap(message);