From fc841e0269af70293400b51499d256814694eabf Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 15 Aug 2013 19:59:05 -0700 Subject: [PATCH] Move inner class to end of file for consistency --- .../orm/jpa/JpaBaseConfiguration.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java index a477c01fa77..45305dac651 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java @@ -76,25 +76,6 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware { return entityManagerFactoryBean; } - @Configuration - @ConditionalOnWebApplication - @ConditionalOnMissingBean({ OpenEntityManagerInViewInterceptor.class, - OpenEntityManagerInViewFilter.class }) - @ConditionalOnExpression("${spring.jpa.openInView:${spring.jpa.open_in_view:true}}") - protected static class JpaWebConfiguration extends WebMvcConfigurerAdapter { - - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addWebRequestInterceptor(openEntityManagerInViewInterceptor()); - } - - @Bean - public OpenEntityManagerInViewInterceptor openEntityManagerInViewInterceptor() { - return new OpenEntityManagerInViewInterceptor(); - } - - } - /** * Determines if the {@code dataSource} being used by Spring was created from * {@link EmbeddedDatabaseConfiguration}. @@ -141,4 +122,23 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware { public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ConfigurableListableBeanFactory) beanFactory; } + + @Configuration + @ConditionalOnWebApplication + @ConditionalOnMissingBean({ OpenEntityManagerInViewInterceptor.class, + OpenEntityManagerInViewFilter.class }) + @ConditionalOnExpression("${spring.jpa.openInView:${spring.jpa.open_in_view:true}}") + protected static class JpaWebConfiguration extends WebMvcConfigurerAdapter { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addWebRequestInterceptor(openEntityManagerInViewInterceptor()); + } + + @Bean + public OpenEntityManagerInViewInterceptor openEntityManagerInViewInterceptor() { + return new OpenEntityManagerInViewInterceptor(); + } + + } }