From 2ddf322a65390b29799388cd8ed9e1ea517b8ea2 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 16 Jun 2014 17:28:59 +0100 Subject: [PATCH] Add @Conditional to prevent HATEOAS blowing up Spring Plugin is required when using @EnableHypermediaSupport --- .../boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java index d218036ab9f..ad1a5f977c5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java @@ -27,6 +27,7 @@ import org.springframework.hateoas.LinkDiscoverers; import org.springframework.hateoas.Resource; import org.springframework.hateoas.config.EnableHypermediaSupport; import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType; +import org.springframework.plugin.core.Plugin; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring HATEOAS's @@ -44,6 +45,7 @@ public class HypermediaAutoConfiguration { @Configuration @EnableHypermediaSupport(type = HypermediaType.HAL) + @ConditionalOnClass(Plugin.class) @ConditionalOnWebApplication protected static class HypermediaConfiguration {