Simplify HypermediaAutoConfiguration

Spring HATEOAS already properly decorates ObjectMappers with @EnableHypermediaSupport. This removes unnecessary calls and decouples Boot from internal Spring HATEOAS APIs at the same time.

Resolves gh-3882

Author: gregturn

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java

@@ -16,14 +16,10 @@
 
 package org.springframework.boot.autoconfigure.hateoas;
 
-import javax.annotation.PostConstruct;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -33,18 +29,14 @@
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.hateoas.EntityLinks;
 import org.springframework.hateoas.LinkDiscoverers;
-import org.springframework.hateoas.RelProvider;
 import org.springframework.hateoas.Resource;
 import org.springframework.hateoas.config.EnableEntityLinks;
 import org.springframework.hateoas.config.EnableHypermediaSupport;
 import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
-import org.springframework.hateoas.hal.CurieProvider;
-import org.springframework.hateoas.hal.Jackson2HalModule;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.plugin.core.Plugin;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -65,7 +57,6 @@
 @ConditionalOnWebApplication
 @AutoConfigureAfter({ WebMvcAutoConfiguration.class, JacksonAutoConfiguration.class,
 		HttpMessageConvertersAutoConfiguration.class })
-@EnableConfigurationProperties(HateoasProperties.class)
 public class HypermediaAutoConfiguration {
 
 	@Configuration
@@ -76,35 +67,6 @@ protected static class HypermediaConfiguration {
 		@ConditionalOnClass({ Jackson2ObjectMapperBuilder.class, ObjectMapper.class })
 		protected static class HalObjectMapperConfiguration {
 
-			@Autowired
-			private HateoasProperties hateoasProperties;
-
-			@Autowired(required = false)
-			private CurieProvider curieProvider;
-
-			@Autowired
-			@Qualifier("_relProvider")
-			private RelProvider relProvider;
-
-			@Autowired(required = false)
-			private ObjectMapper primaryObjectMapper;
-
-			@PostConstruct
-			public void configurePrimaryObjectMapper() {
-				if (this.primaryObjectMapper != null
-						&& this.hateoasProperties.isApplyToPrimaryObjectMapper()) {
-					registerHalModule(this.primaryObjectMapper);
-				}
-			}
-
-			private void registerHalModule(ObjectMapper objectMapper) {
-				objectMapper.registerModule(new Jackson2HalModule());
-				Jackson2HalModule.HalHandlerInstantiator instantiator = new Jackson2HalModule.HalHandlerInstantiator(
-						HalObjectMapperConfiguration.this.relProvider,
-						HalObjectMapperConfiguration.this.curieProvider);
-				objectMapper.setHandlerInstantiator(instantiator);
-			}
-
 			@Bean
 			public static HalObjectMapperConfigurer halObjectMapperConfigurer() {
 				return new HalObjectMapperConfigurer();

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java

@@ -110,9 +110,6 @@ content into your application; rather pick only the properties that you need.
 	multipart.max-file-size=1Mb # Max file size.
 	multipart.max-request-size=10Mb # Max request size.
 
-	# SPRING HATEOAS ({sc-spring-boot-autoconfigure}/hateoas/HateoasProperties.{sc-ext}[HateoasProperties])
-	spring.hateoas.apply-to-primary-object-mapper=true # if the primary mapper should also be configured
-
 	# HTTP encoding ({sc-spring-boot-autoconfigure}/web/HttpEncodingProperties.{sc-ext}[HttpEncodingProperties])
 	spring.http.encoding.charset=UTF-8 # the encoding of HTTP requests/responses
 	spring.http.encoding.enabled=true # enable http encoding support