diff --git a/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterExampleRestConfig.java b/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterExampleRestConfig.java index cfaddb733..7ed0ebcf2 100644 --- a/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterExampleRestConfig.java +++ b/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterExampleRestConfig.java @@ -17,27 +17,27 @@ import org.springframework.hateoas.ResourceProcessor; @ImportResource("classpath:META-INF/spring/security-config.xml") public class RestExporterExampleRestConfig extends RepositoryRestMvcConfiguration { - @Override protected void configureRepositoryRestConfiguration(RepositoryRestConfiguration config) { - config.addResourceMappingForDomainType(Person.class) - .addResourceMappingFor("lastName") - .setPath("surname"); - config.addResourceMappingForDomainType(Person.class) - .addResourceMappingFor("siblings") - .setRel("siblings") - .setPath("siblings"); - } + @Override protected void configureRepositoryRestConfiguration(RepositoryRestConfiguration config) { + config.addResourceMappingForDomainType(Person.class) + .addResourceMappingFor("lastName") + .setPath("surname"); + config.addResourceMappingForDomainType(Person.class) + .addResourceMappingFor("siblings") + .setRel("siblings") + .setPath("siblings"); + } - @Bean public ResourceProcessor> personResourceProcessor() { - return new ResourceProcessor>() { - RepositoryRestConfiguration config = config(); + @Bean public ResourceProcessor> personResourceProcessor() { + return new ResourceProcessor>() { + RepositoryRestConfiguration config = config(); - @Override public Resource process(Resource resource) { - System.out.println("processing " + resource); - System.out.println("url: " + config.getBaseUri().toString()); - resource.add(new Link("http://host:port/path", "myrel")); - return resource; - } - }; - } + @Override public Resource process(Resource resource) { + System.out.println("processing " + resource); + System.out.println("url: " + config.getBaseUri().toString()); + resource.add(new Link("http://host:port/path", "myrel")); + return resource; + } + }; + } } diff --git a/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterWebInitializer.java b/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterWebInitializer.java index d1b18428d..e4913a3a6 100644 --- a/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterWebInitializer.java +++ b/spring-data-rest-example/src/main/java/org/springframework/data/rest/example/RestExporterWebInitializer.java @@ -1,7 +1,5 @@ package org.springframework.data.rest.example; -import java.util.EnumSet; -import javax.servlet.DispatcherType; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRegistration; @@ -9,41 +7,40 @@ import javax.servlet.ServletRegistration; import org.springframework.data.rest.example.gemfire.GemfireRepositoryConfig; import org.springframework.data.rest.example.jpa.JpaRepositoryConfig; import org.springframework.data.rest.example.mongodb.MongoDbRepositoryConfig; -import org.springframework.data.rest.webmvc.RepositoryRestDispatcherServlet; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.web.filter.DelegatingFilterProxy; +import org.springframework.web.servlet.DispatcherServlet; /** * @author Jon Brisbin */ public class RestExporterWebInitializer implements WebApplicationInitializer { - @Override public void onStartup(ServletContext servletContext) throws ServletException { - AnnotationConfigWebApplicationContext rootCtx = new AnnotationConfigWebApplicationContext(); - rootCtx.register( - JpaRepositoryConfig.class, - MongoDbRepositoryConfig.class, - GemfireRepositoryConfig.class - ); + @Override public void onStartup(ServletContext servletContext) throws ServletException { + AnnotationConfigWebApplicationContext rootCtx = new AnnotationConfigWebApplicationContext(); + rootCtx.register( + JpaRepositoryConfig.class, + MongoDbRepositoryConfig.class, + GemfireRepositoryConfig.class + ); - servletContext.addListener(new ContextLoaderListener(rootCtx)); - // servletContext.addFilter("springSecurity", DelegatingFilterProxy.class); - // servletContext.getFilterRegistration("springSecurity").addMappingForUrlPatterns( - // EnumSet.of(DispatcherType.REQUEST), - // false, - // "/*" - // ); + servletContext.addListener(new ContextLoaderListener(rootCtx)); + // servletContext.addFilter("springSecurity", DelegatingFilterProxy.class); + // servletContext.getFilterRegistration("springSecurity").addMappingForUrlPatterns( + // EnumSet.of(DispatcherType.REQUEST), + // false, + // "/*" + // ); - AnnotationConfigWebApplicationContext webCtx = new AnnotationConfigWebApplicationContext(); - webCtx.register(RestExporterExampleRestConfig.class); + AnnotationConfigWebApplicationContext webCtx = new AnnotationConfigWebApplicationContext(); + webCtx.register(RestExporterExampleRestConfig.class); - RepositoryRestDispatcherServlet dispatcherServlet = new RepositoryRestDispatcherServlet(webCtx); - ServletRegistration.Dynamic reg = servletContext.addServlet("rest-exporter", dispatcherServlet); - reg.setLoadOnStartup(1); - reg.addMapping("/*"); + DispatcherServlet dispatcherServlet = new DispatcherServlet(webCtx); + ServletRegistration.Dynamic reg = servletContext.addServlet("rest-exporter", dispatcherServlet); + reg.setLoadOnStartup(1); + reg.addMapping("/*"); - } + } }