From ce466d00ab802751ed2bb4ec5e6b76c8fd2fb1ab Mon Sep 17 00:00:00 2001
From: Jon Brisbin <jbrisbin@vmware.com>
Date: Tue, 2 Oct 2012 09:58:52 -0500
Subject: [PATCH] Changed ApplicationRestConfig to just import
 RepositoryRestMvcConfiguration rather than extend it. It works the same
 either way. It's easier to override the default behavior by extending it, but
 if you're just defining validators and additional components, you can just
 use the `@Import`.

---
 .../springframework/data/rest/test/ApplicationRestConfig.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java
index 232e19af4..b0f255dda 100644
--- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java
+++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/ApplicationRestConfig.java
@@ -15,6 +15,7 @@ import org.codehaus.jackson.map.module.SimpleSerializers;
 import org.codehaus.jackson.map.ser.std.SerializerBase;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.rest.test.webmvc.Person;
@@ -30,7 +31,8 @@ import org.springframework.hateoas.ResourceProcessor;
  * @author Jon Brisbin
  */
 @Configuration
-public class ApplicationRestConfig extends RepositoryRestMvcConfiguration {
+@Import(RepositoryRestMvcConfiguration.class)
+public class ApplicationRestConfig {
 
   @SuppressWarnings({"unchecked"})
   @Bean public ConversionService customConversionService() {