Custom media type registration

src/main/java/org/springframework/hateoas/config/DefaultHateoasConfigurer.java

@@ -0,0 +1,21 @@
+package org.springframework.hateoas.config;
+
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Default implementation of {@link HateoasConfigurer}.
+ *
+ * @author Alexander Morozov
+ */
+public class DefaultHateoasConfigurer implements HateoasConfigurer {
+
+    @Override
+    public List<MediaType> getSupportedMediaTypes() {
+        return Arrays.asList(MediaTypes.HAL_JSON);
+    }
+
+}

src/main/java/org/springframework/hateoas/config/HateoasConfigurer.java

@@ -0,0 +1,20 @@
+package org.springframework.hateoas.config;
+
+import org.springframework.http.MediaType;
+
+import java.util.List;
+
+/**
+ * Configures HATEOAS environment.
+ *
+ * @author Alexander Morozov
+ * @see DefaultHateoasConfigurer
+ */
+public interface HateoasConfigurer {
+
+    /**
+     * @return list of supported {@link MediaType}
+     */
+    public List<MediaType> getSupportedMediaTypes();
+
+}

src/main/java/org/springframework/hateoas/config/HateoasConfigurerResolver.java

@@ -0,0 +1,30 @@
+package org.springframework.hateoas.config;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.util.Assert;
+
+/**
+ * @author Alexander Morozov
+ */
+final class HateoasConfigurerResolver {
+
+    private HateoasConfigurerResolver() {
+        // empty
+    }
+
+    public static HateoasConfigurer resolveHateoasConfigurer(BeanFactory beanFactory) {
+        Assert.notNull(beanFactory, "Bean factory is required.");
+        HateoasConfigurer configurer = null;
+        try {
+            configurer = beanFactory.getBean(HateoasConfigurer.class);
+        } catch (NoSuchBeanDefinitionException ex) {
+            // nop
+        }
+        if (configurer == null) {
+            configurer = new DefaultHateoasConfigurer();
+        }
+        return configurer;
+    }
+
+}

src/main/java/org/springframework/hateoas/config/HypermediaSupportBeanDefinitionRegistrar.java

@@ -17,7 +17,6 @@
 
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
 import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.*;
-import static org.springframework.hateoas.MediaTypes.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -297,9 +296,10 @@ private List<HttpMessageConverter<?>> potentiallyRegisterModule(List<HttpMessage
 			halObjectMapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(relProvider, curieProvider,
 					linkRelationMessageSource, beanFactory));
 
+			HateoasConfigurer hateoasConfigurer = HateoasConfigurerResolver.resolveHateoasConfigurer(beanFactory);
 			MappingJackson2HttpMessageConverter halConverter = new TypeConstrainedMappingJackson2HttpMessageConverter(
 					ResourceSupport.class);
-			halConverter.setSupportedMediaTypes(Arrays.asList(HAL_JSON));
+			halConverter.setSupportedMediaTypes(hateoasConfigurer.getSupportedMediaTypes());
 			halConverter.setObjectMapper(halObjectMapper);
 
 			List<HttpMessageConverter<?>> result = new ArrayList<HttpMessageConverter<?>>(converters.size());

src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.*;
 
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -42,6 +43,7 @@
 import org.springframework.hateoas.core.DelegatingRelProvider;
 import org.springframework.hateoas.hal.HalLinkDiscoverer;
 import org.springframework.hateoas.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
+import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -133,6 +135,21 @@ public void registersHttpMessageConvertersForRestTemplate() {
 		context.close();
 	}
 
+	/**
+	 * @see #263
+	 */
+	@Test
+	public void registerCustomMediaType() {
+
+		AnnotationConfigApplicationContext context =
+				new AnnotationConfigApplicationContext(CustomMediaTypeConfig.class);
+		RestTemplate template = context.getBean(RestTemplate.class);
+
+		assertThat(template.getMessageConverters().get(0).getSupportedMediaTypes(),
+				hasItem(CustomMediaTypeConfig.CUSTOM_TYPE));
+		context.close();
+	}
+
 	/**
 	 * @see #341
 	 */
@@ -219,6 +236,26 @@ static class ExtendedHalConfig extends HalConfig {
 
 	}
 
+	@Configuration
+	static class CustomMediaTypeConfig extends HalConfig {
+
+		public static final MediaType CUSTOM_TYPE = MediaType.parseMediaType("application/vnd.vendor.resource+json");
+
+		@Bean
+		public HateoasConfigurer hateoasConfigurer()
+		{
+			return new HateoasConfigurer() {
+
+				@Override
+				public List<MediaType> getSupportedMediaTypes() {
+					return Arrays.asList(CUSTOM_TYPE);
+				}
+
+			};
+		}
+
+	}
+
 	@Configuration
 	@EnableHypermediaSupport(type = HypermediaType.HAL)
 	static class DelegateConfig {