#1080 - Improved configuration setup and documentation on EntityLinks.

We now explicitly only enable EntityLinks in WebMVC environments. This is also now reflected properly in the reference documentation.

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

@@ -28,7 +28,6 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.support.AbstractMessageSource;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
@@ -58,7 +57,6 @@ import org.springframework.util.ClassUtils;
  * @since 0.19
  */
 @Configuration
-@Import(EntityLinksConfiguration.class)
 @EnablePluginRegistries({ LinkDiscoverer.class })
 public class HateoasConfiguration {
 

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

@@ -30,7 +30,7 @@ import org.springframework.stereotype.Controller;
  * @author Oliver Gierke
  */
 @Configuration
-class WebMvcEntityLinksConfiguration {
+class WebMvcEntityLinksConfiguration extends EntityLinksConfiguration {
 
 	@Bean
 	ControllerEntityLinksFactoryBean webMvcEntityLinks(ObjectProvider<WebMvcLinkBuilderFactory> linkBuilderFactory) {