Switching to spring boot 1.5.3

Julien Cartigny
1 parent 3c085ac4
Showing 6 changed files with 18 additions and 30 deletions Show diff stats
pom.xml
src/main/java/fr/plil/sio/web/mvc/Application.java
src/main/java/fr/plil/sio/web/mvc/ApplicationMvcConfiguration.java
src/test/java/fr/plil/sio/web/mvc/UserRepositoryTest.java
src/test/java/fr/plil/sio/web/mvc/UserServiceTest.java
src/test/java/fr/plil/sio/web/mvc/ViewUsersControllerTest.java
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.4.RELEASE</version>
+        <version>1.5.3.RELEASE</version>
 		<relativePath/>
 	</parent>
@@ -36,6 +36,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+        <!--dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 package fr.plil.sio.web.mvc;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
-@EnableAutoConfiguration
-@Configuration
-@ComponentScan
-@EnableJpaRepositories
-public class Application extends SpringBootServletInitializer {
+@SpringBootApplication
+public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
-
-    @Override
-    protected final SpringApplicationBuilder configure(final SpringApplicationBuilder application) {
-        return application.sources(Application.class);
-    }
 }
@@ -3,15 +3,14 @@ package fr.plil.sio.web.mvc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-@Configuration
+@SpringBootConfiguration
 public class ApplicationMvcConfiguration extends WebMvcConfigurerAdapter {
     private static final Logger logger = LoggerFactory.getLogger(ApplicationMvcConfiguration.class);
@@ -23,6 +22,7 @@ public class ApplicationMvcConfiguration extends WebMvcConfigurerAdapter {
         return new UserSession();
     }
+/*
     @Bean
     public CheckUserInterceptor checkUserInterceptor() {
         return new CheckUserInterceptor();
@@ -34,4 +34,5 @@ public class ApplicationMvcConfiguration extends WebMvcConfigurerAdapter {
         interceptor.setUserSession(userSession());
         registry.addInterceptor(interceptor);
     }
+*/
 }
@@ -2,9 +2,8 @@ package fr.plil.sio.web.mvc;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
@@ -13,9 +12,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Application.class)
+@SpringBootTest(classes = Application.class)
 @Transactional
-@TransactionConfiguration
 public class UserRepositoryTest {
     @Resource
@@ -2,9 +2,8 @@ package fr.plil.sio.web.mvc;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
@@ -12,9 +11,8 @@ import javax.annotation.Resource;
 import static org.junit.Assert.assertEquals;
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Application.class)
+@SpringBootTest(classes = Application.class)
 @Transactional
-@TransactionConfiguration
 public class UserServiceTest {
     @Resource
@@ -3,7 +3,7 @@ package fr.plil.sio.web.mvc;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -18,7 +18,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Application.class)
+@SpringBootTest(classes = Application.class)
 @WebAppConfiguration
 public class ViewUsersControllerTest {