Skip to content

S
spring-boot
Commit 2ddf322a authored by Dave Syer's avatar Dave Syer
Browse files
Options

Add @Conditional to prevent HATEOAS blowing up 

Spring Plugin is required when using @EnableHypermediaSupport
parent 9cc6bff1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java
View file @ 2ddf322a
...@@ -27,6 +27,7 @@ import org.springframework.hateoas.LinkDiscoverers; ...@@ -27,6 +27,7 @@ import org.springframework.hateoas.LinkDiscoverers;
import org.springframework.hateoas.Resource; import org.springframework.hateoas.Resource;
import org.springframework.hateoas.config.EnableHypermediaSupport; import org.springframework.hateoas.config.EnableHypermediaSupport;
import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType; import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
import org.springframework.plugin.core.Plugin;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring HATEOAS's * {@link EnableAutoConfiguration Auto-configuration} for Spring HATEOAS's
...@@ -44,6 +45,7 @@ public class HypermediaAutoConfiguration { ...@@ -44,6 +45,7 @@ public class HypermediaAutoConfiguration {
@Configuration @Configuration
@EnableHypermediaSupport(type = HypermediaType.HAL) @EnableHypermediaSupport(type = HypermediaType.HAL)
@ConditionalOnClass(Plugin.class)
@ConditionalOnWebApplication @ConditionalOnWebApplication
protected static class HypermediaConfiguration { protected static class HypermediaConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment