升级 Spring Boot 到 1.5.1

Author: abel533

README.md

@@ -1,6 +1,6 @@
 # Spring Boot 集成 MyBatis, 分页插件 PageHelper, 通用 Mapper 
 
-- [Spring Boot 1.4.3.RELEASE](https://github.com/spring-projects/spring-boot)
+- [Spring Boot 1.5.1.RELEASE](https://github.com/spring-projects/spring-boot)
 - [mybatis-spring-boot-starter 1.1.1](https://github.com/mybatis/spring-boot-starter)
 - [mapper-spring-boot-starter 1.0.0](https://github.com/abel533/mapper-boot-starter)
 - [pagehelper-spring-boot-starter 1.1.0](https://github.com/pagehelper/pagehelper-spring-boot)

pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.3.RELEASE</version>
+        <version>1.5.1.RELEASE</version>
     </parent>
 
     <properties>

src/main/java/tk/mybatis/springboot/Application.java

@@ -7,7 +7,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import tk.mybatis.springboot.util.MyMapper;
 
 /**
  * @author liuzh
@@ -16,7 +15,7 @@
 @Controller
 @EnableWebMvc
 @SpringBootApplication
-@MapperScan(basePackages = "tk.mybatis.springboot.mapper", markerInterface = MyMapper.class)
+@MapperScan(basePackages = "tk.mybatis.springboot.mapper")
 public class Application extends WebMvcConfigurerAdapter {
 
     public static void main(String[] args) {

src/test/java/tk/mybatis/springboot/mapper/MyBatis331Test.java

@@ -30,7 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -48,7 +48,7 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @Transactional
-@SpringApplicationConfiguration(Application.class)
+@SpringBootTest(classes = Application.class)
 public class MyBatis331Test {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -70,7 +70,7 @@ public void testInsertList() {
     }
 
     @Test
-    public void testSelectById(){
+    public void testSelectById() {
         City2 city2 = mapper.selectByCityId(1);
         logger.info(city2.toString());
         Assert.assertNotNull(city2);
@@ -79,9 +79,9 @@ public void testSelectById(){
     }
 
     @Test
-    public void testSelectAll(){
+    public void testSelectAll() {
         List<City2> city2List = mapper.selectAll();
-        for(City2 c2 : city2List){
+        for (City2 c2 : city2List) {
             logger.info(c2.toString());
             Assert.assertNotNull(c2);
             Assert.assertNotNull(c2.getCityName());